Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-01-09 13:31:11 +08:00
parent 645a6b0ede 7261dc6c54
commit 5b93bc16e4
9 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/control.php
+1
View File
@@ -21,6 +21,7 @@ class productplan extends control
public function commonAction($productID, $branch = 0)
{
$this->loadModel('product');
$this->app->loadConfig('project');
$product = $this->product->getById($productID);
$this->view->product = $product;
$this->view->branch = $branch;
module/productplan/js/create.js
+8 -1
View File
@@ -25,6 +25,13 @@ function computeEndDate(delta)
beginDate = $('#begin').val();
if(!beginDate) return;
endDate = convertStringToDate(beginDate).addDays(parseInt(delta)).toString('yyyy-MM-dd');
delta = parseInt(delta);
beginDate = convertStringToDate(beginDate);
if((delta == 7 || delta == 14) && (beginDate.getDay() == 1))
{
delta = (weekend == 2) ? (delta - 2) : (delta - 1);
}
endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd');
$('#end').val(endDate);
}
module/productplan/js/edit.js
+8 -1
View File
@@ -25,6 +25,13 @@ function computeEndDate(delta)
beginDate = $('#begin').val();
if(!beginDate) return;
endDate = convertStringToDate(beginDate).addDays(parseInt(delta)).toString('yyyy-MM-dd');
delta = parseInt(delta);
beginDate = convertStringToDate(beginDate);
if((delta == 7 || delta == 14) && (beginDate.getDay() == 1))
{
delta = (weekend == 2) ? (delta - 2) : (delta - 1);
}
endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd');
$('#end').val(endDate);
}
module/productplan/view/create.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('weekend', $config->project->weekend);?>
<?php js::import($jsRoot . 'misc/date.js');?>
<div class='container mw-1400px'>
<div id='titlebar'>
module/productplan/view/edit.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('weekend', $config->project->weekend);?>
<?php js::import($jsRoot . 'misc/date.js');?>
<div class='container mw-1400px'>
<div id='titlebar'>
module/project/js/common.js
+8 -2
View File
@@ -103,8 +103,14 @@ function computeEndDate(delta)
beginDate = $('#begin').val();
if(!beginDate) return;
endDate = convertStringToDate(beginDate).addDays(parseInt(delta));
endDate = endDate.toString('yyyy-MM-dd');
delta = parseInt(delta);
beginDate = convertStringToDate(beginDate);
if((delta == 7 || delta == 14) && (beginDate.getDay() == 1))
{
delta = (weekend == 2) ? (delta - 2) : (delta - 1);
}
endDate = beginDate.addDays(delta - 1).toString('yyyy-MM-dd');
$('#end').val(endDate);
computeWorkDays();
}
module/project/view/create.html.php
+1
View File
@@ -31,6 +31,7 @@
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::import($jsRoot . 'misc/date.js');?>
<?php js::set('weekend', $config->project->weekend);?>
<?php js::set('holders', $lang->project->placeholder);?>
<div class='container mw-1400px'>
<div id='titlebar'>
module/project/view/edit.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
<td>
<div class='input-group'>
<?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?>
<span class='input-group-addon'><?php echo $lang->project->to;?></span>
<span class='input-group-addon fix-border'><?php echo $lang->project->to;?></span>
<?php echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
<div class='input-group-btn'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
www/theme/default/style.css
+1 -1
View File
@@ -585,7 +585,7 @@ body {color:#141414; padding-bottom: 40px;}
.outer .table tbody td > a:visited, #crumbs > a:visited, .side > a:visited {color: #551A8B}
/* Querybox */
#querybox {margin: 35px -10px -7px; background-color: #fff; height: 0; border-top: 1px solid #ddd; position: relative; z-index: 1000; overflow: visible; display: none;}
#querybox {margin: 5px -10px -7px; background-color: #fff; height: 0; border-top: 1px solid #ddd; position: relative; z-index: 1000; overflow: visible; display: none; width: 100%; float: left;}
#querybox form {padding: 10px}
#querybox.show {display: block; height: auto}
#titlebar #querybox {margin: 5px -20px -10px}