Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
This commit is contained in:
qiyu-xie
+26
-42
@@ -35,17 +35,6 @@ $lang->program->begin = 'Begin';
|
||||
$lang->program->end = 'End';
|
||||
$lang->program->status = 'Status';
|
||||
$lang->program->PM = 'Project Manager';
|
||||
$lang->program->create = 'Create';
|
||||
$lang->program->createGuide = 'Select the project template';
|
||||
$lang->program->browse = 'Program List';
|
||||
$lang->program->edit = 'Edit';
|
||||
$lang->program->all = 'All';
|
||||
$lang->program->start = 'Start';
|
||||
$lang->program->finish = 'Finish';
|
||||
$lang->program->suspend = 'Suspend';
|
||||
$lang->program->delete = 'Delete';
|
||||
$lang->program->close = 'Close';
|
||||
$lang->program->activate = 'Activate';
|
||||
$lang->program->budget = 'Budget';
|
||||
$lang->program->dateRange = 'Date Range';
|
||||
$lang->program->to = ' to ';
|
||||
@@ -69,19 +58,12 @@ $lang->program->doneStories = 'Done stories';
|
||||
$lang->program->leftStories = 'Left stories';
|
||||
$lang->program->allInput = 'All Input';
|
||||
$lang->program->weekly = 'Program Weekly';
|
||||
|
||||
|
||||
$lang->program->pv = 'PV';
|
||||
$lang->program->ev = 'EV';
|
||||
$lang->program->sv = 'SV%';
|
||||
$lang->program->ac = 'AC';
|
||||
$lang->program->cv = 'CV%';
|
||||
$lang->program->pm = 'PM';
|
||||
|
||||
$lang->program->manageGroupMember = 'Manage Group Members';
|
||||
$lang->program->durationEstimation = 'Workload estimate';
|
||||
$lang->program->noProgram = 'No projects';
|
||||
$lang->program->accessDenied = 'You do not have access to this project!';
|
||||
$lang->program->teamCount = 'The Number Of Team';
|
||||
|
||||
$lang->program->unitList[''] = '';
|
||||
@@ -112,27 +94,29 @@ $lang->program->statusList['doing'] = 'Doing';
|
||||
$lang->program->statusList['suspended'] = 'Suspended';
|
||||
$lang->program->statusList['closed'] = 'Closed';
|
||||
|
||||
$lang->program->noProgram = 'No Program';
|
||||
$lang->program->accessDenied = 'Has No Access To The Program';
|
||||
$lang->program->chooseProgramType = 'Choose management type';
|
||||
$lang->program->nextStep = 'Next step';
|
||||
$lang->program->hoursUnit = '%s hours';
|
||||
$lang->program->membersUnit = '%s members';
|
||||
$lang->program->lastIteration = 'Latest iterations';
|
||||
$lang->program->ongoingStage = 'Ongoing stage';
|
||||
$lang->program->scrum = 'Scrum';
|
||||
$lang->program->scrumTitle = 'Scrum development full process project management';
|
||||
$lang->program->scrumDesc = '<strong>Introduction: </strong>Iterate in small steps, release quickly<br><strong>Contains function points: </strong>Project overview, iterations, plans, stories, etc.';
|
||||
$lang->program->cmmi = 'CMMI';
|
||||
$lang->program->cmmiTitle = 'CMMI management';
|
||||
$lang->program->cmmiDesc = '<strong>Introduction: </strong>Standardized management by stages<br><strong>Contains function points: </strong>Estimate, plan, stage, report, etc.';
|
||||
$lang->program->cannotCreateChild = 'The project already has actual content and can not add subprojects directly. You can create a parent project for the current project and then add a child project under the new parent project.';
|
||||
$lang->program->hasChildren = 'This project has a subproject and can not be deleted.';
|
||||
$lang->program->confirmDelete = 'Do you want to delete this project?';
|
||||
$lang->program->emptyPM = 'No program manager';
|
||||
$lang->program->hasChildren = 'This project has a subproject and can not be deleted.';
|
||||
$lang->program->confirmDelete = "Are you sure you want to delete the item [% s ] ?";
|
||||
$lang->program->cannotChangeToCat = "The project already has the actual content and can not be modified as a parent project";
|
||||
$lang->program->cannotCancelCat = "There are already children under this project. You can not unmark the parent project";
|
||||
$lang->program->cannotChangeToCat = "The project already has the actual content and can not be modified as a parent project";
|
||||
$lang->program->cannotCancelCat = "There are already children under this project. You can not unmark the parent project";
|
||||
$lang->program->noProgram = 'No Program';
|
||||
$lang->program->accessDenied = 'Has No Access To The Program';
|
||||
$lang->program->chooseProgramType = 'Choose management type';
|
||||
$lang->program->nextStep = 'Next step';
|
||||
$lang->program->hoursUnit = '%s hours';
|
||||
$lang->program->membersUnit = '%s members';
|
||||
$lang->program->lastIteration = 'Latest iterations';
|
||||
$lang->program->ongoingStage = 'Ongoing stage';
|
||||
$lang->program->scrum = 'Scrum';
|
||||
$lang->program->scrumTitle = 'Scrum development full process project management';
|
||||
$lang->program->scrumDesc = '<strong>Introduction: </strong>Iterate in small steps, release quickly<br><strong>Contains function points: </strong>Project overview, iterations, plans, stories, etc.';
|
||||
$lang->program->cmmi = 'CMMI';
|
||||
$lang->program->cmmiTitle = 'CMMI management';
|
||||
$lang->program->cmmiDesc = '<strong>Introduction: </strong>Standardized management by stages<br><strong>Contains function points: </strong>Estimate, plan, stage, report, etc.';
|
||||
$lang->program->cannotCreateChild = 'The project already has actual content and can not add subprojects directly. You can create a parent project for the current project and then add a child project under the new parent project.';
|
||||
$lang->program->hasChildren = 'This project has a subproject and can not be deleted.';
|
||||
$lang->program->confirmDelete = 'Do you want to delete this project?';
|
||||
$lang->program->emptyPM = 'No program manager';
|
||||
$lang->program->cannotChangeToCat = "The project already has the actual content and can not be modified as a parent project";
|
||||
$lang->program->cannotCancelCat = "There are already children under this project. You can not unmark the parent project";
|
||||
$lang->program->parentBeginEnd = "Begin and end date of parent project: %s ~ %s";
|
||||
$lang->program->parentBudget = "Parent project budget: %s";
|
||||
$lang->program->beginLetterParent = "Begin date of parent project: %s, Begin date cannot be less than the begin date of parent project.";
|
||||
$lang->program->endGreaterParent = "End date of parent project: %s, End date cannot be greater than the end date of parent project.";
|
||||
$lang->program->beginGreateChild = "Minimum begin date of child project: %s, the begin date of parent project cannot be greater than the minimum begin date of child project.";
|
||||
$lang->program->endLetterChild = "Maximum end date of child project: %s, the end date of parent project cannot be less than the maximum end date of child project.";
|
||||
|
||||
@@ -353,10 +353,10 @@ class programModel extends model
|
||||
->get();
|
||||
$program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->edit['id'], $this->post->uid);
|
||||
|
||||
if(!empty($program->isCat) and $this->checkHasContent($programID)) dao::$errors['isCat'] = $this->lang->program->cannotChangeToCat;
|
||||
if(empty($program->isCat) and $this->checkHasChildren($programID)) dao::$errors['isCat'] = $this->lang->program->cannotCancelCat;
|
||||
if(!$oldProgram->isCat and !empty($program->isCat) and $this->checkHasContent($programID)) dao::$errors['isCat'] = $this->lang->program->cannotChangeToCat;
|
||||
if($oldProgram->isCat and empty($program->isCat) and $this->checkHasChildren($programID)) dao::$errors['isCat'] = $this->lang->program->cannotCancelCat;
|
||||
|
||||
if($program->isCat)
|
||||
if(!empty($program->isCat))
|
||||
{
|
||||
$minChildBegin = $this->dao->select('min(begin) as minBegin')->from(TABLE_PROJECT)->where('id')->ne($programID)->andWhere('deleted')->eq(0)->andWhere('path')->like("%,{$programID},%")->fetch('minBegin');
|
||||
$maxChildEnd = $this->dao->select('max(end) as maxEnd')->from(TABLE_PROJECT)->where('id')->ne($programID)->andWhere('deleted')->eq(0)->andWhere('path')->like("%,{$programID},%")->fetch('maxEnd');
|
||||
|
||||
@@ -15,6 +15,9 @@ class risk extends control
|
||||
*/
|
||||
public function browse($browseType = 'all', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
|
||||
{
|
||||
$uri = $this->app->getURI(true);
|
||||
$this->session->set('riskList', $uri);
|
||||
|
||||
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
|
||||
/* Build the search form. */
|
||||
$actionURL = $this->createLink('risk', 'browse', "browseType=bysearch&queryID=myQueryID");
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
$(function()
|
||||
{
|
||||
$('#riskindex').attr('readonly', true);
|
||||
$('#pri').attr('disabled', true);
|
||||
computeIndex();
|
||||
function computeIndex()
|
||||
{
|
||||
var impact = $('#impact').val();
|
||||
var probability = $('#probability').val();
|
||||
var riskindex = parseInt(impact * probability);
|
||||
var pri = '';
|
||||
if(0 < riskindex && riskindex <= 5) pri = 'low';
|
||||
if(5 < riskindex && riskindex <= 12) pri = 'middle';
|
||||
if(15 <= riskindex && riskindex <= 25) pri = 'high';
|
||||
|
||||
$('#riskindex').val(riskindex);
|
||||
$('#pri').val(pri);
|
||||
$('#pri').trigger("chosen:updated")
|
||||
$('#pri').chosen();
|
||||
$('#pri').attr('disabled', true);
|
||||
$('input[name="pri"]').remove();
|
||||
$('#pri').after("<input type='hidden' name='pri' value='" + pri + "'/>");
|
||||
}
|
||||
|
||||
$('#impact, #probability').change(function(){computeIndex()});
|
||||
})
|
||||
@@ -8,7 +8,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='w-50px'><?php echo $lang->risk->id;?></th>
|
||||
<th><?php echo $lang->risk->name;?></th>
|
||||
<th class='required'><?php echo $lang->risk->name;?></th>
|
||||
<th class='w-200px'><?php echo $lang->risk->source;?></th>
|
||||
<th class='w-200px'><?php echo $lang->risk->category;?></th>
|
||||
<th class='w-200px'><?php echo $lang->risk->strategy;?></th>
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->risk->strategy;?></th>
|
||||
<td><?php echo zget($lang->risk->strategy, $risk->strategy);?></td>
|
||||
<td><?php echo zget($lang->risk->strategyList, $risk->strategy);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->risk->status;?></th>
|
||||
@@ -86,11 +86,11 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->risk->impact;?></th>
|
||||
<td><?php echo zget($lang->risk->impact, $risk->impact);?></td>
|
||||
<td><?php echo zget($lang->risk->impactList, $risk->impact);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->risk->probability;?></th>
|
||||
<td><?php echo zget($lang->risk->probability, $risk->probability);?></td>
|
||||
<td><?php echo zget($lang->risk->probabilityList, $risk->probability);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->risk->riskindex;?></th>
|
||||
|
||||
Reference in New Issue
Block a user