diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 8f88d6f2b4..d726527a92 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -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 = 'Introduction: Iterate in small steps, release quickly Contains function points: Project overview, iterations, plans, stories, etc.';
-$lang->program->cmmi = 'CMMI';
-$lang->program->cmmiTitle = 'CMMI management';
-$lang->program->cmmiDesc = 'Introduction: Standardized management by stages Contains function points: 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 = 'Introduction: Iterate in small steps, release quickly Contains function points: Project overview, iterations, plans, stories, etc.';
+$lang->program->cmmi = 'CMMI';
+$lang->program->cmmiTitle = 'CMMI management';
+$lang->program->cmmiDesc = 'Introduction: Standardized management by stages Contains function points: 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.";
diff --git a/module/program/model.php b/module/program/model.php
index 2575f62164..241b941be5 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -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');
diff --git a/module/risk/control.php b/module/risk/control.php
index 916a0d0a0f..21a37ffc06 100644
--- a/module/risk/control.php
+++ b/module/risk/control.php
@@ -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");
diff --git a/module/risk/js/common.js b/module/risk/js/common.js
new file mode 100644
index 0000000000..f315512f29
--- /dev/null
+++ b/module/risk/js/common.js
@@ -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("");
+ }
+
+ $('#impact, #probability').change(function(){computeIndex()});
+})
diff --git a/module/risk/view/batchcreate.html.php b/module/risk/view/batchcreate.html.php
index 454bc77718..22a2e0af8e 100644
--- a/module/risk/view/batchcreate.html.php
+++ b/module/risk/view/batchcreate.html.php
@@ -8,7 +8,7 @@
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index cb08f062cc..3406cbdb6b 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -55,6 +55,7 @@ $lang->task->allModule = 'All Module';
$lang->task->common = 'Aufgabe';
$lang->task->id = 'ID';
+$lang->task->program = 'Program';
$lang->task->project = $lang->projectCommon;
$lang->task->module = 'Modul';
$lang->task->moduleAB = 'Modul';
@@ -152,6 +153,7 @@ $lang->task->statusList['closed'] = 'Geschlossen';
$lang->task->typeList[''] = '';
$lang->task->typeList['design'] = 'Design';
$lang->task->typeList['devel'] = 'Entwicklung';
+$lang->task->typeList['request'] = 'Request';
$lang->task->typeList['test'] = 'Test';
$lang->task->typeList['study'] = 'Studie';
$lang->task->typeList['discuss'] = 'Diskusion';
@@ -198,18 +200,20 @@ $lang->task->createDenied = 'Aufgben erstellen it in diesem Projekt ges
$lang->task->cannotDeleteParent = 'Cannot delete parent task';
$lang->task->error = new stdclass();
-$lang->task->error->consumedNumber = '"Verbraucht" muss eine Zahl sein.';
-$lang->task->error->estimateNumber = '"Stunden" müss eine Zahl sein.';
-$lang->task->error->recordMinus = 'Work hours should not be negative number.';
-$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.';
-$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an';
-$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"';
-$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.';
-$lang->task->error->skipClose = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?';
-$lang->task->error->consumed = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.';
-$lang->task->error->assignedTo = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.';
-$lang->task->error->consumedEmpty = '"Current Cost" should not be empty.';
-$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".';
+$lang->task->error->consumedNumber = '"Verbraucht" muss eine Zahl sein.';
+$lang->task->error->estimateNumber = '"Stunden" müss eine Zahl sein.';
+$lang->task->error->recordMinus = 'Work hours should not be negative number.';
+$lang->task->error->consumedSmall = '"Genutzt" muss larger than before.';
+$lang->task->error->consumedThisTime = 'Bitte geben Sie die Stunden an';
+$lang->task->error->left = 'Bitte geben Sie die verbleibenden Stunden an"';
+$lang->task->error->work = '"Bemerkung" muss kleiner als %d Zeichen sein.';
+$lang->task->error->skipClose = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?';
+$lang->task->error->consumed = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.';
+$lang->task->error->assignedTo = 'Mehere Tasks können nicht zugewisen werden, da die Benutzer nicht teil des Teams sind.';
+$lang->task->error->consumedEmpty = '"Current Cost" should not be empty.';
+$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".';
+$lang->task->error->realStartedEmpty = '"Real Started" should not be empty.';
+$lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
/* Report. */
$lang->task->report = new stdclass();
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 5ddf7a1042..3e79e2723b 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -55,6 +55,7 @@ $lang->task->allModule = 'All Module';
$lang->task->common = 'Tâche';
$lang->task->id = 'ID';
+$lang->task->program = 'Program';
$lang->task->project = $lang->projectCommon;
$lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
@@ -152,6 +153,7 @@ $lang->task->statusList['closed'] = 'Fermée';
$lang->task->typeList[''] = '';
$lang->task->typeList['design'] = 'Design';
$lang->task->typeList['devel'] = 'Développement';
+$lang->task->typeList['request'] = 'Request';
$lang->task->typeList['test'] = 'Test';
$lang->task->typeList['study'] = 'Analyse';
$lang->task->typeList['discuss'] = 'Discussion';
@@ -198,18 +200,20 @@ $lang->task->createDenied = 'La création de tâches est interdite dans
$lang->task->cannotDeleteParent = 'Cannot delete parent task';
$lang->task->error = new stdclass();
-$lang->task->error->consumedNumber = '"Coût" doit être numérique.';
-$lang->task->error->estimateNumber = '"Estimé" doit être numérique.';
-$lang->task->error->recordMinus = 'Work hours should not be negative number.';
-$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.';
-$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"';
-$lang->task->error->left = 'Entrez les "Heures Restantes"';
-$lang->task->error->work = '"Commentaire" doit être < %d caractères.';
-$lang->task->error->skipClose = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?';
-$lang->task->error->consumed = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.';
-$lang->task->error->assignedTo = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe.";
-$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être vide.';
-$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".';
+$lang->task->error->consumedNumber = '"Coût" doit être numérique.';
+$lang->task->error->estimateNumber = '"Estimé" doit être numérique.';
+$lang->task->error->recordMinus = 'Work hours should not be negative number.';
+$lang->task->error->consumedSmall = '"Coût Total" doit être > au dernier chiffre.';
+$lang->task->error->consumedThisTime = 'Entrez le "Coût en Heures"';
+$lang->task->error->left = 'Entrez les "Heures Restantes"';
+$lang->task->error->work = '"Commentaire" doit être < %d caractères.';
+$lang->task->error->skipClose = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?';
+$lang->task->error->consumed = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.';
+$lang->task->error->assignedTo = "Tâche Multi-user dans le statut courant ne peut pas être assignée à un membre qui ne fait pas partie de l'équipe.";
+$lang->task->error->consumedEmpty = '"Coût Actuel" ne devrait pas être vide.';
+$lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".';
+$lang->task->error->realStartedEmpty = '"Real Started" should not be empty.';
+$lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
/* Report. */
$lang->task->report = new stdclass();
diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php
index 48f18fee62..ee8ccae65b 100644
--- a/module/task/lang/vi.php
+++ b/module/task/lang/vi.php
@@ -55,6 +55,7 @@ $lang->task->allModule = 'Tất cả Module';
$lang->task->common = 'Nhiệm vụ';
$lang->task->id = 'ID';
+$lang->task->program = 'Program';
$lang->task->project = $lang->projectCommon;
$lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
@@ -152,6 +153,7 @@ $lang->task->statusList['closed'] = 'Đã đóng';
$lang->task->typeList[''] = '';
$lang->task->typeList['design'] = 'Thiết kế';
$lang->task->typeList['devel'] = 'Phát triển';
+$lang->task->typeList['request'] = 'Request';
$lang->task->typeList['test'] = 'Đang test';
$lang->task->typeList['study'] = 'Study';
$lang->task->typeList['discuss'] = 'Thảo luận';
@@ -198,18 +200,20 @@ $lang->task->createDenied = 'Tạo nhiệm vụ bị từ chối trong
$lang->task->cannotDeleteParent = 'Không thể xóa nhiệm vụ cha';
$lang->task->error = new stdclass();
-$lang->task->error->consumedNumber = '"Giờ làm" phải là số.';
-$lang->task->error->estimateNumber = '"Dự tính" phải là số.';
-$lang->task->error->recordMinus = 'Giờ làm không nên là số âm';
-$lang->task->error->consumedSmall = '"Tổng giờ làm" phải là > số cuối cùng.';
-$lang->task->error->consumedThisTime = 'Vui lòng nhập "Số giờ làm"';
-$lang->task->error->left = 'Vui lòng nhập "Giờ còn lại"';
-$lang->task->error->work = '"Nhận xét" phải là < %d ký tự.';
-$lang->task->error->skipClose = 'Nhiệm vụ: %s không là "Kết thúc” hoặc “Đã hủy”. Bạn có muốn đóng nó?';
-$lang->task->error->consumed = 'Nhiệm vụ: %s giờ phải là < 0. Bỏ qua thay đổi cho nhiệm vụ này.';
-$lang->task->error->assignedTo = 'Nhiệm vụ nhiều người dùng trong tình trạng hiện tại không thể giao cho một thành viên người không trong Nhóm nhiệm vụ.';
-$lang->task->error->consumedEmpty = '"Giờ làm" không nên trống.';
-$lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày bắt đầu".';
+$lang->task->error->consumedNumber = '"Giờ làm" phải là số.';
+$lang->task->error->estimateNumber = '"Dự tính" phải là số.';
+$lang->task->error->recordMinus = 'Giờ làm không nên là số âm';
+$lang->task->error->consumedSmall = '"Tổng giờ làm" phải là > số cuối cùng.';
+$lang->task->error->consumedThisTime = 'Vui lòng nhập "Số giờ làm"';
+$lang->task->error->left = 'Vui lòng nhập "Giờ còn lại"';
+$lang->task->error->work = '"Nhận xét" phải là < %d ký tự.';
+$lang->task->error->skipClose = 'Nhiệm vụ: %s không là "Kết thúc” hoặc “Đã hủy”. Bạn có muốn đóng nó?';
+$lang->task->error->consumed = 'Nhiệm vụ: %s giờ phải là < 0. Bỏ qua thay đổi cho nhiệm vụ này.';
+$lang->task->error->assignedTo = 'Nhiệm vụ nhiều người dùng trong tình trạng hiện tại không thể giao cho một thành viên người không trong Nhóm nhiệm vụ.';
+$lang->task->error->consumedEmpty = '"Giờ làm" không nên trống.';
+$lang->task->error->deadlineSmall = '"Hạn chót" phải lớn hơn "Ngày bắt đầu".';
+$lang->task->error->realStartedEmpty = '"Real Started" should not be empty.';
+$lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
/* Report. */
$lang->task->report = new stdclass();