diff --git a/db/update16.4.sql b/db/update16.4.sql index 3d4955d33d..3e1f5b85c9 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -28,22 +28,22 @@ ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL DEFAULT 'rnd,lite' AFTE UPDATE `zt_user` SET `visions`='rnd,lite'; INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES -('lite', '管理员', 'liteUser', '迅捷版用户分组'); +('lite', '管理员', 'liteAdmin', '迅捷版用户分组'); INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES -('lite', '项目管理', 'liteUser', '迅捷版用户分组'); +('lite', '项目管理', 'liteProject', '迅捷版用户分组'); INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES -('lite', '团队成员', 'liteUser', '迅捷版用户分组'); +('lite', '团队成员', 'liteTeam', '迅捷版用户分组'); REPLACE INTO `zt_grouppriv`(`module`, `method`,`group`) -SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `name` = '管理员' and `vision` = 'lite') from `zt_grouppriv` where `group` = 1; +SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `role` = 'liteAdmin' and `vision` = 'lite') from `zt_grouppriv` where `group` = 1; REPLACE INTO `zt_grouppriv`(`module`, `method`,`group`) -SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `name` = '项目管理' and `vision` = 'lite') from `zt_grouppriv` where `group` = 4; +SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `role` = 'liteProject' and `vision` = 'lite') from `zt_grouppriv` where `group` = 4; REPLACE INTO `zt_grouppriv`(`module`, `method`,`group`) -SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `name` = '团队成员' and `vision` = 'lite') from `zt_grouppriv` where `group` = 9; +SELECT `module`, `method`,(SELECT `id` FROM zt_group WHERE `role` = 'liteTeam' and `vision` = 'lite') from `zt_grouppriv` where `group` = 9; ALTER TABLE `zt_productplan` ADD `closedReason` varchar(20) NOT NULL AFTER `order`; diff --git a/extension/lite/attend/ext/view/detail.oa.html.hook.php b/extension/lite/attend/ext/view/detail.oa.html.hook.php new file mode 100644 index 0000000000..e3466bb752 --- /dev/null +++ b/extension/lite/attend/ext/view/detail.oa.html.hook.php @@ -0,0 +1,9 @@ + + + diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php new file mode 100644 index 0000000000..784ba54c82 --- /dev/null +++ b/extension/lite/attend/ext/view/personal.html.php @@ -0,0 +1,211 @@ + + * @package attend + * @version $Id$ + * @link http://www.zentao.net + */ +?> +getModuleRoot() . 'common/view/header.html.php';?> + +
+ +
+ +
+
+
+
+
    + +
  • '> + +
      + +
    • '> + +
      • + +
    +
    • + +
+
+
+
+
+
+ config->attend->workingDays > 7) + { + $startDate = strtotime("$currentYear-$currentMonth-01"); + $startDate = date('w', $startDate) == 0 ? $startDate : strtotime("last Sunday", $startDate); + $endDate = strtotime("next month -1 day $currentYear-$currentMonth-01"); + $endDate = date('w', $endDate) == 6 ? $endDate : strtotime("next Saturday", $endDate); + $firstDayIndex = 0; + $lastDayIndex = 6; + } + else + { + $startDate = strtotime("$currentYear-$currentMonth-01"); + $startDate = date('w', $startDate) == 1 ? $startDate : strtotime("last Monday", $startDate); + $endDate = strtotime("next month -1 day $currentYear-$currentMonth-01"); + $endDate = date('w', $endDate) == 0 ? $endDate : strtotime("next Sunday", $endDate); + $firstDayIndex = 1; + $lastDayIndex = 0; + } + ?> + + + +
+
+
+ + + + + + + + + + + + + + + status;?> + reason;?> + + reviewStatus) ? $attend->reviewStatus : '';?> + + + + + + + + + + + + + + + + + +
attend->weeks[$weekIndex];?>attend->dayName;?>attend->signIn;?>attend->signOut;?>actions . '/' . $lang->attend->status;?>
datepicker->abbrDayNames[$dayIndex]?> + signOut, 0, 5);?> + attend->statusList[$status];?> + attend->statusList['early'];?> + + + attend->edited : $lang->attend->edit; + $leave = $reason == 'leave' ? $lang->attend->leaved : $lang->attend->leave; + $makeup = $reason == 'makeup' ? $lang->attend->makeuped : $lang->attend->makeup; + $overtime = $reason == 'overtime' ? $lang->attend->overtimed : $lang->attend->overtime; + $lieu = $reason == 'lieu' ? $lang->attend->lieud : $lang->attend->lieu; + $trip = $reason == 'trip' ? $lang->attend->triped : $lang->attend->trip; + $egress = $reason == 'egress' ? $lang->attend->egress : $lang->attend->egress; + ?> + hoursList):?> + hoursList as $status => $hours) + { + if($index > 1) $statusLabel .= '
'; + $statusLabel .= $lang->attend->statusList[$status] . $hours . 'h'; + $index++; + } + ?> +
+ + + + + +
+ + + + + + + + + + + createLink('attend', 'edit', "date=" . $date), $edit, "data-toggle='modal' data-width='500px'");?> + +
+ actions;?> + +
+ + + + attend->overtime, "data-toggle='modal' data-width='700px'");?> + + + attend->statusList[$status];?> + +
datepicker->abbrDayNames[$dayIndex]?>
+
+
+ +
+ + + +
+
+
+ +getModuleRoot() . 'common/view/footer.html.php';?> diff --git a/extension/lite/attend/ext/view/personalsettings.oa.html.hook.php b/extension/lite/attend/ext/view/personalsettings.oa.html.hook.php new file mode 100644 index 0000000000..6468f2deb5 --- /dev/null +++ b/extension/lite/attend/ext/view/personalsettings.oa.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/extension/lite/attend/ext/view/setmanager.oa.html.hook.php b/extension/lite/attend/ext/view/setmanager.oa.html.hook.php new file mode 100644 index 0000000000..cc6165d5c1 --- /dev/null +++ b/extension/lite/attend/ext/view/setmanager.oa.html.hook.php @@ -0,0 +1,7 @@ + diff --git a/extension/lite/attend/ext/view/settings.oa.html.hook.php b/extension/lite/attend/ext/view/settings.oa.html.hook.php new file mode 100644 index 0000000000..2051e2ba60 --- /dev/null +++ b/extension/lite/attend/ext/view/settings.oa.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index d010fef107..661d9e63bd 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -58,6 +58,7 @@ $lang->my->menu->index = array('link' => "$lang->dashboard|my|index"); $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->task = array('link' => "{$lang->task->common}|my|contribute|mode=task&type=assignedTo", 'subModule' => 'task'); $lang->my->menu->contacts = array('link' => "$lang->contact|my|managecontacts|"); +if($config->systemScore) $lang->my->menu->score = array('link' => "{$lang->score->shortCommon}|my|score|", 'subModule' => 'score'); global $config; if($config->edition != 'open') $lang->my->menu->effort = array('link' => 'Effort|effort|calendar|', 'exclude' => 'my-todo'); diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index f6f3feccfd..f6b37feac0 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -58,6 +58,7 @@ $lang->my->menu->index = array('link' => "$lang->dashboard|my|index"); $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->task = array('link' => "{$lang->task->common}|my|contribute|mode=task&type=assignedTo", 'subModule' => 'task'); $lang->my->menu->contacts = array('link' => "$lang->contact|my|managecontacts|"); +if($config->systemScore) $lang->my->menu->score = array('link' => "{$lang->score->shortCommon}|my|score|", 'subModule' => 'score'); global $config; if($config->edition != 'open') $lang->my->menu->effort = array('link' => '日志|effort|calendar|', 'exclude' => 'my-todo'); diff --git a/extension/lite/execution/ext/lang/zh-cn/lite.php b/extension/lite/execution/ext/lang/zh-cn/lite.php index 7999584f13..618fa15cf4 100644 --- a/extension/lite/execution/ext/lang/zh-cn/lite.php +++ b/extension/lite/execution/ext/lang/zh-cn/lite.php @@ -7,6 +7,7 @@ $lang->execution->createKanban = '创建看板'; $lang->execution->noExecution = "暂时没有看板。"; $lang->execution->importTask = '转入任务'; $lang->execution->batchCreateTask = '批量创建任务'; +$lang->execution->linkStory = "创建{$lang->SRCommon}"; $lang->execution->kanbanGroup['default'] = '默认方式'; $lang->execution->kanbanGroup['story'] = '目标'; diff --git a/extension/lite/leave/ext/view/browse.oa.html.hook.php b/extension/lite/leave/ext/view/browse.oa.html.hook.php new file mode 100644 index 0000000000..cfb4b19194 --- /dev/null +++ b/extension/lite/leave/ext/view/browse.oa.html.hook.php @@ -0,0 +1,7 @@ + + diff --git a/extension/lite/lieu/ext/view/browse.oa.html.hook.php b/extension/lite/lieu/ext/view/browse.oa.html.hook.php new file mode 100644 index 0000000000..cfb4b19194 --- /dev/null +++ b/extension/lite/lieu/ext/view/browse.oa.html.hook.php @@ -0,0 +1,7 @@ + + diff --git a/extension/lite/makeup/ext/view/browse.oa.html.hook.php b/extension/lite/makeup/ext/view/browse.oa.html.hook.php new file mode 100644 index 0000000000..cfb4b19194 --- /dev/null +++ b/extension/lite/makeup/ext/view/browse.oa.html.hook.php @@ -0,0 +1,7 @@ + + diff --git a/extension/lite/overtime/ext/view/browse.oa.html.hook.php b/extension/lite/overtime/ext/view/browse.oa.html.hook.php new file mode 100644 index 0000000000..cfb4b19194 --- /dev/null +++ b/extension/lite/overtime/ext/view/browse.oa.html.hook.php @@ -0,0 +1,7 @@ + + diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index ffffa96aca..2735bcf69a 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -376,29 +376,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; echo "
  • " . html::a('javascript:;', $lang->story->review, '', $class) . '
    • '; } - - if($storyType == 'story') - { - if($canBatchChangeStage) - { - echo "
  • "; - echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'"); - echo "
    • '; - } - else - { - $class= "class='disabled'"; - echo "
  • " . html::a('javascript:;', $lang->story->stageAB, '', $class) . '
    • '; - } - } ?> @@ -462,9 +439,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; - - story->importToLib, '', 'class="btn" data-toggle="modal" id="importToLib"');?> -
    show('right', 'pagerjs');?> diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php index 6583ef2260..ff6885c62c 100644 --- a/extension/lite/task/ext/view/create.html.php +++ b/extension/lite/task/ext/view/create.html.php @@ -15,6 +15,9 @@ app->getModuleRoot() . '/common/view/sortable.html.php';?> id));?> +config->vision);?> + + @@ -95,7 +98,7 @@ task->story;?> - task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?> + task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?>
    story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?> preview;?> diff --git a/extension/lite/todo/ext/lang/en/lite.php b/extension/lite/todo/ext/lang/en/lite.php index 43a7402c0c..d27984e77d 100644 --- a/extension/lite/todo/ext/lang/en/lite.php +++ b/extension/lite/todo/ext/lang/en/lite.php @@ -3,3 +3,8 @@ $lang->todo->typeList['task'] = 'Task'; unset($lang->todo->typeList['bug']); unset($lang->todo->typeList['testtask']); +unset($lang->todo->typeList['review']); +unset($lang->todo->typeList['issue']); +unset($lang->todo->typeList['risk']); +unset($lang->todo->typeList['opportunity']); +unset($lang->todo->typeList['meeting']); diff --git a/extension/lite/todo/ext/lang/zh-cn/lite.php b/extension/lite/todo/ext/lang/zh-cn/lite.php index 7b162f90ef..c3f4110cde 100644 --- a/extension/lite/todo/ext/lang/zh-cn/lite.php +++ b/extension/lite/todo/ext/lang/zh-cn/lite.php @@ -3,3 +3,8 @@ $lang->todo->typeList['task'] = '任务'; unset($lang->todo->typeList['bug']); unset($lang->todo->typeList['testtask']); +unset($lang->todo->typeList['review']); +unset($lang->todo->typeList['issue']); +unset($lang->todo->typeList['risk']); +unset($lang->todo->typeList['opportunity']); +unset($lang->todo->typeList['meeting']); diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index d55e356c80..3868039d0a 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -11,7 +11,7 @@ #cards .panel-heading {padding: 12px 24px 10px 16px;} #cards .panel-body {padding: 0 16px 16px;} #cards .panel-actions {padding: 7px 0; z-index: 0} -#cards .project-type-label {padding: 1px 2px;} +#cards .project-type-label {padding: 2px 2px; margin-bottom: 3px;} #cards .project-name {font-size: 16px; font-weight: normal; display: inline-block; max-width: 75%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle;} #cards .project-infos {font-size: 12px; padding: 0 15px;} #cards .project-infos > span {display: inline-block; line-height: 12px;} @@ -44,11 +44,10 @@
    - model === 'waterfall'): ?> - project->waterfall; ?> - - project->scrum; ?> - + systemMode == 'new'):?> + model == 'waterfall' ? 'label-warning' : 'label-info';?> + project->{$project->model};?> + name);?>