From a195088ba3770cf4a323dd2c6ea60d97c22d4852 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 8 Sep 2022 10:07:45 +0800 Subject: [PATCH] * fix for edit team. --- module/task/js/activate.js | 9 +++++---- module/task/js/edit.js | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/module/task/js/activate.js b/module/task/js/activate.js index c4aacfa326..bbaa94f90e 100644 --- a/module/task/js/activate.js +++ b/module/task/js/activate.js @@ -14,7 +14,7 @@ $('#confirmButton').click(function() var $tr = $(this).closest('tr'); var account = $(this).find('option:selected').text(); - estimate = parseFloat($tr.find('[name^=teamEstimate]').val()); + var estimate = parseFloat($tr.find('[name^=teamEstimate]').val()); if(!isNaN(estimate)) totalEstimate += estimate; if(isNaN(estimate) || estimate == 0) { @@ -23,12 +23,13 @@ $('#confirmButton').click(function() return false; } - consumed = parseFloat($tr.find('[name^=teamConsumed]').val()); + var consumed = parseFloat($tr.find('[name^=teamConsumed]').val()); if(!isNaN(consumed)) totalConsumed += consumed; - left = parseFloat($tr.find('[name^=teamLeft]').val()); + var $left = $tr.find('[name^=teamLeft]'); + var left = parseFloat($left.val()); if(!isNaN(left)) totalLeft += left; - if(!$tr.hasClass('member-done') && (isNaN(left) || left == 0)) + if(!$left.prop('readonly') && (isNaN(left) || left == 0)) { bootbox.alert(account + ' ' + leftNotEmpty); error = true; diff --git a/module/task/js/edit.js b/module/task/js/edit.js index f59094b8fd..8c6147bb47 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -97,7 +97,7 @@ $('#confirmButton').click(function() var $tr = $(this).closest('tr'); var account = $(this).find('option:selected').text(); - estimate = parseFloat($tr.find('[name^=teamEstimate]').val()); + var estimate = parseFloat($tr.find('[name^=teamEstimate]').val()); if(!isNaN(estimate)) totalEstimate += estimate; if(isNaN(estimate) || estimate == 0) { @@ -106,12 +106,13 @@ $('#confirmButton').click(function() return false; } - consumed = parseFloat($tr.find('[name^=teamConsumed]').val()); + var consumed = parseFloat($tr.find('[name^=teamConsumed]').val()); if(!isNaN(consumed)) totalConsumed += consumed; - left = parseFloat($tr.find('[name^=teamLeft]').val()); + var $left = $tr.find('[name^=teamLeft]'); + var left = parseFloat($left.val()); if(!isNaN(left)) totalLeft += left; - if(!$tr.hasClass('member-done') && (isNaN(left) || left == 0)) + if(!$left.prop('readonly') && (isNaN(left) || left == 0)) { bootbox.alert(account + ' ' + leftNotEmpty); error = true;