From f00d94cf42f2ca62f2bf4592d3f2291bfa265cc6 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 26 Apr 2021 14:48:23 +0800 Subject: [PATCH] * Fix bug #12325. --- module/program/js/create.js | 11 +++++++++++ module/program/js/edit.js | 11 +++++++++++ module/project/control.php | 2 +- module/project/js/common.js | 6 ++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/module/program/js/create.js b/module/program/js/create.js index 54607ac1d9..a23674ec40 100644 --- a/module/program/js/create.js +++ b/module/program/js/create.js @@ -25,6 +25,17 @@ $(function() $('#end').removeAttr('disabled'); } }); + + $('#end').change(function() + { + var beginDate = $('#begin').val(); + var endDate = $('#end').val(); + var begin = new Date(beginDate.replace(/-/g,"/")); + var end = new Date(endDate.replace(/-/g,"/")); + var time = end.getTime() - begin.getTime(); + var days = parseInt(time / (1000 * 60 * 60 * 24)) + 1; + if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false); + }) }); function setCopyProject(copiedProgramID) diff --git a/module/program/js/edit.js b/module/program/js/edit.js index 1dcb3582f2..2949acf5fa 100644 --- a/module/program/js/edit.js +++ b/module/program/js/edit.js @@ -27,5 +27,16 @@ $(function() } }); + $('#end').change(function() + { + var beginDate = $('#begin').val(); + var endDate = $('#end').val(); + var begin = new Date(beginDate.replace(/-/g,"/")); + var end = new Date(endDate.replace(/-/g,"/")); + var time = end.getTime() - begin.getTime(); + var days = parseInt(time / (1000 * 60 * 60 * 24)) + 1; + if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false); + }) + $('#isCat').change(); }); diff --git a/module/project/control.php b/module/project/control.php index dd8c4a05c6..72a554689a 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -273,7 +273,7 @@ class project extends control $this->loadModel('action')->create('project', $projectID, 'opened'); /* Link the plan stories. */ - if($_POST['plans']) + if(!empty($_POST['plans'])) { foreach($_POST['plans'] as $planID) { diff --git a/module/project/js/common.js b/module/project/js/common.js index 760170c28a..7e2ab51d43 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -75,6 +75,12 @@ function computeWorkDays(currentID) { beginDate = $('#begin').val(); endDate = $('#end').val(); + + var begin = new Date(beginDate.replace(/-/g,"/")); + var end = new Date(endDate.replace(/-/g,"/")); + var time = end.getTime() - begin.getTime(); + var days = parseInt(time / (1000 * 60 * 60 * 24)) + 1; + if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked',false); } if(beginDate && endDate)