Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of git@github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
azhi
2013-08-02 10:15:38 +08:00
parent 79dfd7851b 87a7c2b9a5
commit 16ff3a0c12
14 changed files with 113 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/blockproducts.html.php
+1 -1
View File
@@ -1,6 +1,6 @@
<div class='block linkbox1' id='productbox'>
<?php if(empty($productStats)):?>
<table class='table-1 a-center bg-gray' height='138px'>
<table class='table-1 a-center' height='138px'>
<caption><span class='icon-allProducts'>&nbsp;</span><?php echo $lang->my->home->products;?></caption>
<tr>
<td valign='middle'>
module/my/view/blockprojects.html.php
+1 -1
View File
@@ -1,6 +1,6 @@
<div class='block linkbox1' id='projectbox'>
<?php if(count($projectStats) == 0):?>
<table class='table-1 a-center bg-gray' height='138px'>
<table class='table-1 a-center' height='138px'>
<caption><span class='icon-allProjects'>&nbsp;</span><?php echo $lang->my->home->projects;?></caption>
<tr>
<td valign='middle'>
module/product/control.php
+1 -1
View File
@@ -475,7 +475,7 @@ class product extends control
public function ajaxGetPlans($productID, $planID = 0, $needCreate = false)
{
$plans = $this->loadModel('productplan')->getPairs($productID);
$output = html::select('plan', $plans, $planID, "class='select-1'");
$output = html::select('plan', $plans, $planID, "class='select-3'");
if(count($plans) == 1 and $needCreate)
{
$output .= html::a($this->createLink('productplan', 'create', "productID=$productID"), $this->lang->productplan->create, '_blank');
module/story/lang/en.php
+14
View File
@@ -195,6 +195,7 @@ $lang->story->report = new stdclass();
$lang->story->report->common = 'Report';
$lang->story->report->select = 'Select';
$lang->story->report->create = 'Create';
$lang->story->report->value = 'Stories';
$lang->story->report->charts['storysPerProduct'] = 'Product storys';
$lang->story->report->charts['storysPerModule'] = 'Module storys';
@@ -237,6 +238,19 @@ $lang->story->report->storysPerClosedReason = new stdclass();
$lang->story->report->storysPerEstimate = new stdclass();
$lang->story->report->storysPerChange = new stdclass();
$lang->story->report->storysPerProduct->item = 'Product';
$lang->story->report->storysPerModule->item = 'Module';
$lang->story->report->storysPerSource->item = 'Source';
$lang->story->report->storysPerPlan->item = 'Plan';
$lang->story->report->storysPerStatus->item = 'Status';
$lang->story->report->storysPerStage->item = 'Stage';
$lang->story->report->storysPerPri->item = 'Pri';
$lang->story->report->storysPerOpenedBy->item = 'Account';
$lang->story->report->storysPerAssignedTo->item = 'Account';
$lang->story->report->storysPerClosedReason->item = 'Reason';
$lang->story->report->storysPerEstimate->item = 'Estimate';
$lang->story->report->storysPerChange->item = 'Change';
$lang->story->report->storysPerProduct->graph = new stdclass();
$lang->story->report->storysPerModule->graph = new stdclass();
$lang->story->report->storysPerSource->graph = new stdclass();
module/story/lang/zh-cn.php
+14
View File
@@ -195,6 +195,7 @@ $lang->story->report = new stdclass();
$lang->story->report->common = '报表';
$lang->story->report->select = '请选择报表类型';
$lang->story->report->create = '生成报表';
$lang->story->report->value = '需求数';
$lang->story->report->charts['storysPerProduct'] = '产品需求数量';
$lang->story->report->charts['storysPerModule'] = '模块需求数量';
@@ -237,6 +238,19 @@ $lang->story->report->storysPerClosedReason = new stdclass();
$lang->story->report->storysPerEstimate = new stdclass();
$lang->story->report->storysPerChange = new stdclass();
$lang->story->report->storysPerProduct->item = '产品';
$lang->story->report->storysPerModule->item = '模块';
$lang->story->report->storysPerSource->item = '来源';
$lang->story->report->storysPerPlan->item = '计划';
$lang->story->report->storysPerStatus->item = '状态';
$lang->story->report->storysPerStage->item = '阶段';
$lang->story->report->storysPerPri->item = '优先级';
$lang->story->report->storysPerOpenedBy->item = '用户';
$lang->story->report->storysPerAssignedTo->item = '用户';
$lang->story->report->storysPerClosedReason->item = '原因';
$lang->story->report->storysPerEstimate->item = '预计工时';
$lang->story->report->storysPerChange->item = '变更次数';
$lang->story->report->storysPerProduct->graph = new stdclass();
$lang->story->report->storysPerModule->graph = new stdclass();
$lang->story->report->storysPerSource->graph = new stdclass();
module/story/view/report.html.php
+2 -2
View File
@@ -40,8 +40,8 @@
<table class='table-1 colored'>
<caption><?php echo $lang->story->report->charts[$chartType];?></caption>
<tr>
<th><?php echo $lang->report->item;?></th>
<th><?php echo $lang->report->value;?></th>
<th><?php echo $lang->story->report->$chartType->item;?></th>
<th><?php echo $lang->story->report->value;?></th>
<th><?php echo $lang->report->percent;?></th>
</tr>
<?php foreach($datas[$chartType] as $key => $data):?>
module/task/js/create.js
+16 -3
View File
@@ -69,10 +69,23 @@ function setAfter()
}
}
/* Get select of stories.*/
function setStories(moduleID, projectID, productID)
/**
* load stories of module.
*
* @access public
* @return void
*/
function loadModuleRelated()
{
link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=' + productID + '&moduleID=' + moduleID);
moduleID = $('#module').val();
projectID = $('#project').val();
setStories(moduleID, projectID);
}
/* Get select of stories.*/
function setStories(moduleID, projectID)
{
link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&moduleID=' + moduleID);
$.get(link, function(stories)
{
if(!stories) stories = '<select id="story" name="story"></select>';
module/task/js/edit.js
+29
View File
@@ -65,3 +65,32 @@ function loadProjectMembers(projectID)
link = createLink('project', 'ajaxGetMembers', 'projectID=' + projectID);
$('#assignedToIdBox').load(link);
}
/**
* load stories of module.
*
* @access public
* @return void
*/
function loadModuleRelated()
{
moduleID = $('#module').val();
projectID = $('#project').val();
setStories(moduleID, projectID);
}
/* Get select of stories.*/
function setStories(moduleID, projectID)
{
link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&moduleID=' + moduleID);
$.get(link, function(stories)
{
if(!stories) stories = '<select id="story" name="story"></select>';
$('#story').replaceWith(stories);
$('#story_chzn').remove();
$("#story").chosen({no_results_text: ''});
});
}
/* empty function. */
function setPreview(){}
module/task/lang/en.php
+15
View File
@@ -155,6 +155,7 @@ $lang->task->report = new stdclass();
$lang->task->report->common = 'Report';
$lang->task->report->select = 'Select';
$lang->task->report->create = 'Create';
$lang->task->report->value = 'Tasks';
$lang->task->report->charts['tasksPerProject'] = 'Project tasks';
$lang->task->report->charts['tasksPerModule'] = 'Module tasks';
@@ -199,6 +200,20 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
$lang->task->report->tasksPerProject->item ='Project';
$lang->task->report->tasksPerModule->item ='Module';
$lang->task->report->tasksPerAssignedTo->item ='Account';
$lang->task->report->tasksPerType->item ='Type';
$lang->task->report->tasksPerPri->item ='Pri';
$lang->task->report->tasksPerStatus->item ='Status';
$lang->task->report->tasksPerDeadline->item ='Date';
$lang->task->report->tasksPerEstimate->item ='Estimate';
$lang->task->report->tasksPerLeft->item ='Left';
$lang->task->report->tasksPerConsumed->item ='Consumed';
$lang->task->report->tasksPerFinishedBy->item ='Account';
$lang->task->report->tasksPerClosedReason->item ='Reason';
$lang->task->report->finishedTasksPerDay->item ='Date';
$lang->task->report->tasksPerProject->graph = new stdclass();
$lang->task->report->tasksPerModule->graph = new stdclass();
$lang->task->report->tasksPerAssignedTo->graph = new stdclass();
module/task/lang/zh-cn.php
+15
View File
@@ -155,6 +155,7 @@ $lang->task->report = new stdclass();
$lang->task->report->common = '报表';
$lang->task->report->select = '请选择报表类型';
$lang->task->report->create = '生成报表';
$lang->task->report->value = '任务数';
$lang->task->report->charts['tasksPerProject'] = '项目任务数统计';
$lang->task->report->charts['tasksPerModule'] = '模块任务数统计';
@@ -199,6 +200,20 @@ $lang->task->report->tasksPerFinishedBy = new stdclass();
$lang->task->report->tasksPerClosedReason = new stdclass();
$lang->task->report->finishedTasksPerDay = new stdclass();
$lang->task->report->tasksPerProject->item ='项目';
$lang->task->report->tasksPerModule->item ='模块';
$lang->task->report->tasksPerAssignedTo->item ='用户';
$lang->task->report->tasksPerType->item ='类型';
$lang->task->report->tasksPerPri->item ='优先级';
$lang->task->report->tasksPerStatus->item ='状态';
$lang->task->report->tasksPerDeadline->item ='日期';
$lang->task->report->tasksPerEstimate->item ='预计';
$lang->task->report->tasksPerLeft->item ='剩余';
$lang->task->report->tasksPerConsumed->item ='消耗';
$lang->task->report->tasksPerFinishedBy->item ='用户';
$lang->task->report->tasksPerClosedReason->item ='原因';
$lang->task->report->finishedTasksPerDay->item ='日期';
$lang->task->report->tasksPerProject->graph = new stdclass();
$lang->task->report->tasksPerModule->graph = new stdclass();
$lang->task->report->tasksPerAssignedTo->graph = new stdclass();
module/task/view/create.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->module;?></th>
<td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='select-3' onchange='setStories(this.value,$project->id,0)'");?></span></td>
<td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='select-3' onchange='setStories(this.value,$project->id)'");?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
module/task/view/edit.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</tr>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->module;?></th>
<td><span id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="select-1"');?></span></td>
<td><span id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="select-1" onchange="loadModuleRelated()"');?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->story;?></th>
module/task/view/report.html.php
+2 -2
View File
@@ -42,8 +42,8 @@
<table class='table-1 colored'>
<caption><?php echo $lang->task->report->charts[$chartType];?></caption>
<tr>
<th><?php echo $lang->report->item;?></th>
<th><?php echo $lang->report->value;?></th>
<th><?php echo $lang->task->report->$chartType->item;?></th>
<th><?php echo $lang->task->report->value;?></th>
<th><?php echo $lang->report->percent;?></th>
</tr>
<?php foreach($datas[$chartType] as $key => $data):?>
module/tree/control.php
+1 -1
View File
@@ -306,7 +306,7 @@ class tree extends control
$optionMenu = $this->tree->getOptionMenu($rootID, $viewType, $rootModuleID);
if($returnType == 'html')
{
$output = html::select("module", $optionMenu, '', "onchange=setAssignedTo()");
$output = html::select("module", $optionMenu, '', "onchange=loadModuleRelated()");
if(count($optionMenu) == 1 and $needManage)
{
$output .= html::a($this->createLink('tree', 'browse', "rootID=$rootID&view=$viewType"), $this->lang->tree->manage, '_blank');