From 9cffc3bcf7dfdbd61acd2e174e7d2c09cb16c1b5 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 15 Mar 2022 11:13:26 +0800 Subject: [PATCH] * Fix bug #20754,20776,20759. --- .../attend/ext/view/detail.oa.html.hook.php | 9 + .../lite/attend/ext/view/personal.html.php | 211 ++++++++++++++++++ .../view/personalsettings.oa.html.hook.php | 6 + .../ext/view/setmanager.oa.html.hook.php | 7 + .../attend/ext/view/settings.oa.html.hook.php | 6 + module/group/control.php | 2 +- module/holiday/model.php | 10 +- 7 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 extension/lite/attend/ext/view/detail.oa.html.hook.php create mode 100644 extension/lite/attend/ext/view/personal.html.php create mode 100644 extension/lite/attend/ext/view/personalsettings.oa.html.hook.php create mode 100644 extension/lite/attend/ext/view/setmanager.oa.html.hook.php create mode 100644 extension/lite/attend/ext/view/settings.oa.html.hook.php 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/module/group/control.php b/module/group/control.php index 8d83ca966a..d3737d9e81 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -306,7 +306,7 @@ class group extends control $this->view->position = $position; $this->view->allUsers = $allUsers; $this->view->group = $group; - $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('type')->eq('project')->andWhere('deleted')->eq(0)->fetchPairs(); + $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('type')->eq('project')->andWhere('vision')->eq($this->config->vision)->andWhere('deleted')->eq(0)->fetchPairs(); $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManageProjectAdminLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->userPrograms = $userPrograms; diff --git a/module/holiday/model.php b/module/holiday/model.php index 004dcc41e7..943110a11e 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -13,7 +13,7 @@ class holidayModel extends model { /** * Get holiday by id. - * + * * @param int $id * @access public * @return object @@ -66,8 +66,8 @@ class holidayModel extends model { $holiday = fixer::input('post')->get(); $holiday->year = substr($holiday->begin, 0, 4); - if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin); - if(helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end); + if($holiday->year and helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin); + if($holiday->end and helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end); $this->dao->insert(TABLE_HOLIDAY)->data($holiday) ->autoCheck() @@ -302,7 +302,7 @@ class holidayModel extends model /** * Update project plan duration. - * + * * @param string $beginDate * @param string $endDate * @access public @@ -407,4 +407,4 @@ class holidayModel extends model $this->dao->update(TABLE_TASK)->set('realDuration')->eq($realDuration)->where('id')->eq($task->id)->exec(); } } -} \ No newline at end of file +}