* Fix bug #20754,20776,20759.
This commit is contained in:
tanghucheng
9
extension/lite/attend/ext/view/detail.oa.html.hook.php
Normal file
9
extension/lite/attend/ext/view/detail.oa.html.hook.php
Normal file
@@ -0,0 +1,9 @@
|
||||
<?php if(common::checkNotCN()):?>
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('#searchForm .form-group #account').closest('.input-group').find('.input-group-addon').css('padding', '5px 32px');
|
||||
$('#searchForm .form-group #date').closest('.input-group').find('.input-group-addon').css('padding', '5px 32px');
|
||||
})
|
||||
</script>
|
||||
<?php endif;?>
|
||||
211
extension/lite/attend/ext/view/personal.html.php
Normal file
211
extension/lite/attend/ext/view/personal.html.php
Normal file
@@ -0,0 +1,211 @@
|
||||
<?php
|
||||
/**
|
||||
* The personal view file of attend module of Ranzhi.
|
||||
*
|
||||
* @copyright Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author liyuchun <liyuchun@cnezsoft.com>
|
||||
* @package attend
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
|
||||
<style>
|
||||
#menuActions{float:right !important; margin-top: -60px !important;}
|
||||
.input-group-required > .required::after, .required-wrapper.required::after {top:12px !important;}
|
||||
.modal-body .table {margin-bottom:0px !important;}
|
||||
</style>
|
||||
<div id='featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
$methodName = strtolower($this->app->getMethodName());
|
||||
foreach($lang->attend->featurebar as $key => $menu)
|
||||
{
|
||||
if(is_string($menu)) $link = $menu;
|
||||
if(is_array($menu)) $link = $menu['link'];
|
||||
|
||||
list($name, $currentModule, $currentMethod, $params) = explode('|', $link);
|
||||
$class = strtolower($key) == $methodName ? "class='active'" : '';
|
||||
if(isset($menu['alias'])) $class = strpos(strtolower($menu['alias']), strtolower($key)) !== false ? "class='active'" : $class;
|
||||
if(common::hasPriv($currentModule, $currentMethod)) echo "<li id='$key' $class>" . html::a($this->createLink($currentModule, $currentMethod, $params), $name) . '</li>';
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class='with-side'>
|
||||
<div class='side'>
|
||||
<div class='panel panel-sm'>
|
||||
<div class='panel-body'>
|
||||
<ul class='tree' data-ride='tree' data-collapsed='true'>
|
||||
<?php foreach($yearList as $year):?>
|
||||
<li class='<?php echo $year == $currentYear ? 'active' : ''?>'>
|
||||
<?php extCommonModel::printLink('attend', 'personal', "date=$year", $year);?>
|
||||
<ul>
|
||||
<?php foreach($monthList[$year] as $month):?>
|
||||
<li class='<?php echo ($year == $currentYear and $month == $currentMonth) ? 'active' : ''?>'>
|
||||
<?php extCommonModel::printLink('attend', 'personal', "date=$year$month", $year . $month);?>
|
||||
</li>
|
||||
<?php endforeach;?>
|
||||
</ul>
|
||||
</li>
|
||||
<?php endforeach;?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='main'>
|
||||
<div class='row'>
|
||||
<?php
|
||||
$weekIndex = 0;
|
||||
if($this->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;
|
||||
}
|
||||
?>
|
||||
<?php while($startDate <= $endDate):?>
|
||||
<?php $dayIndex = date('w', $startDate);?>
|
||||
<?php if($dayIndex == $firstDayIndex):?>
|
||||
<div class='col-xs-4'>
|
||||
<div class='panel'>
|
||||
<div class='panel-body no-padding'>
|
||||
<table class="table table-data text-center table-fixed">
|
||||
<thead>
|
||||
<tr class='text-center'>
|
||||
<th class='w-80px'><?php echo $lang->attend->weeks[$weekIndex];?></th>
|
||||
<th class='w-40px'><?php echo $lang->attend->dayName;?></th>
|
||||
<th title='<?php echo $lang->attend->signIn;?>'><?php echo $lang->attend->signIn;?></th>
|
||||
<th title='<?php echo $lang->attend->signOut;?>'><?php echo $lang->attend->signOut;?></th>
|
||||
<th class='w-100px'><?php echo $lang->actions . '/' . $lang->attend->status;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php endif;?>
|
||||
<?php $currentDate = date('Y-m-d', $startDate);?>
|
||||
<?php if(isset($attends[$currentDate])):?>
|
||||
<?php $attend = $attends[$currentDate];?>
|
||||
<?php $status = $attend->status;?>
|
||||
<?php $reason = $attend->reason;?>
|
||||
<?php $date = date('Ymd', $startDate);?>
|
||||
<?php $reviewStatus = isset($attend->reviewStatus) ? $attend->reviewStatus : '';?>
|
||||
<tr class="text-middle attend-<?php echo $status?> <?php echo (date('m', $startDate) == $currentMonth) ? '' : 'otherMonth'?>" title='<?php echo $lang->attend->statusList[$status]?>'>
|
||||
<td><?php echo formatTime($currentDate, DT_DATE1);?></td>
|
||||
<td><?php echo $lang->datepicker->abbrDayNames[$dayIndex]?></td>
|
||||
<td class='attend-signin'>
|
||||
<?php $signIn = substr($attend->signIn, 0, 5);?>
|
||||
<?php if(strpos(',late,absent,rest,leave,lieu,', ",$status,") !== false) $signIn = $lang->attend->statusList[$status];?>
|
||||
<?php if($status == 'both') $signIn = $lang->attend->statusList['late'];?>
|
||||
<?php echo $signIn;?>
|
||||
</td>
|
||||
<td class='attend-signout'>
|
||||
<?php $signOut = substr($attend->signOut, 0, 5);?>
|
||||
<?php if(strpos(',early,absent,rest,leave,lieu,', ",$status,") !== false) $signOut = $lang->attend->statusList[$status];?>
|
||||
<?php if($status == 'both') $signOut = $lang->attend->statusList['early'];?>
|
||||
<?php echo $signOut;?>
|
||||
</td>
|
||||
<td class='attend-actions'>
|
||||
<?php
|
||||
$edit = $reviewStatus == 'wait' ? $lang->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;
|
||||
?>
|
||||
<?php if($attend->hoursList):?>
|
||||
<?php
|
||||
$index = 1;
|
||||
$statusLabel = '';
|
||||
foreach($attend->hoursList as $status => $hours)
|
||||
{
|
||||
if($index > 1) $statusLabel .= '<br/>';
|
||||
$statusLabel .= $lang->attend->statusList[$status] . $hours . 'h';
|
||||
$index++;
|
||||
}
|
||||
?>
|
||||
<div class='dropdown text-left'>
|
||||
<a href='javascript:;' data-toggle='dropdown'>
|
||||
<span class='attend-<?php echo $status;?>'><?php echo $statusLabel;?></span>
|
||||
<span class='caret'></span>
|
||||
</a>
|
||||
<ul role='menu' class='dropdown-menu'>
|
||||
<li><?php echo baseHTML::a($this->createLink('attend', 'edit', "date=" . $date), $edit, "data-toggle='modal' data-width='500px'") . "</li>";?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php elseif($status == 'leave'):?>
|
||||
<span class='attend-<?php echo $status;?>'>
|
||||
<?php extCommonModel::printLink('leave', 'create', "date=" . $date, $leave, "data-toggle='modal' data-width='700px'");?>
|
||||
</span>
|
||||
<?php elseif($status == 'lieu'):?>
|
||||
<span class='attend-<?php echo $status;?>'>
|
||||
<?php extCommonModel::printLink('lieu', 'create', "date=" . $date, $lieu, "data-toggle='modal' data-width='700px'");?>
|
||||
</span>
|
||||
<?php elseif(strpos(',rest,normal,', ",$status,") === false):?>
|
||||
<?php if($reviewStatus == 'wait' or strpos(',late,early,both,', ",$status,") !== false):?>
|
||||
<?php echo baseHTML::a($this->createLink('attend', 'edit', "date=" . $date), $edit, "data-toggle='modal' data-width='500px'");?>
|
||||
<?php else:?>
|
||||
<div class='dropdown'>
|
||||
<a href='javascript:;' data-toggle='dropdown'><?php echo $lang->actions;?><span class='caret'></span></a>
|
||||
<ul role='menu' class='dropdown-menu'>
|
||||
<?php if($reason == '' or $reason == 'normal') extCommonModel::printLink('attend', 'edit', "date=" . $date, $edit, "data-toggle='modal' data-width='500px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'leave') extCommonModel::printLink('leave', 'create', "date=" . $date, $leave, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'makeup') extCommonModel::printLink('makeup', 'create', "date=" . $date, $makeup, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'overtime') extCommonModel::printLink('overtime', 'create', "date=" . $date, $overtime, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'lieu') extCommonModel::printLink('lieu', 'create', "date=" . $date, $lieu, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'trip') extCommonModel::printLink('trip', 'create', "date=" . $date, $trip, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
<?php if($reason == '' or $reason == 'egress') extCommonModel::printLink('egress', 'create', "date=" . $date, $egress, "data-toggle='modal' data-width='700px'", '', '', 'li');?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<?php elseif($status == 'rest'):?>
|
||||
<span class='attend-<?php echo $status;?>'>
|
||||
<?php extCommonModel::printLink('overtime', 'create', "date=" . $date, $lang->attend->overtime, "data-toggle='modal' data-width='700px'");?>
|
||||
</span>
|
||||
<?php elseif($status == 'normal'):?>
|
||||
<span class='attend-<?php echo $status;?>'><?php echo $lang->attend->statusList[$status];?></span>
|
||||
<?php endif;?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php else:?>
|
||||
<tr class="<?php echo (date('m', $startDate) == $currentMonth) ? '' : 'otherMonth'?>">
|
||||
<td><?php echo formatTime($currentDate, DT_DATE1);?></td>
|
||||
<td><?php echo $lang->datepicker->abbrDayNames[$dayIndex]?></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<?php if($dayIndex == $lastDayIndex):?>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<?php $weekIndex += 1;?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<?php $startDate = strtotime('+1 day', $startDate);?>
|
||||
<?php endwhile;?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('.side .has-active-item').addClass('open');
|
||||
})
|
||||
</script>
|
||||
<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
|
||||
@@ -0,0 +1,6 @@
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('#featurebar #settings').addClass('active');
|
||||
})
|
||||
</script>
|
||||
@@ -0,0 +1,7 @@
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('#featurebar #settings').addClass('active');
|
||||
$('a.setDept').attr('href', createLink('dept', 'browse'));
|
||||
})
|
||||
</script>
|
||||
6
extension/lite/attend/ext/view/settings.oa.html.hook.php
Normal file
6
extension/lite/attend/ext/view/settings.oa.html.hook.php
Normal file
@@ -0,0 +1,6 @@
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('#ajaxForm .table #signInClient').closest('tr').hide();
|
||||
})
|
||||
</script>
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user