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

* [task#132764,done,1h] modify delay tips of project and execution.

Browse Source
This commit is contained in:
liumengyi
2024-11-20 08:53:28 +08:00
committed by 刘梦艺
parent 684998005f
commit b7ecc7aa08
8 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/all.ui.js
+1 -1
View File
@@ -41,7 +41,7 @@ window.onRenderCell = function(result, {col, row})
executionName += '<div class="ml-1 clip" style="width: max-content;">';
executionName += (!row.data.isParent) ? `<a href="${executionLink}" class="text-primary">${row.data.name}</a>` : row.data.name;
executionName += '</div>';
executionName += (!['done', 'closed', 'suspended'].includes(row.data.status) && today > row.data.end) ? `<span class="label danger-pale ml-1 flex-none">${delayed}</span>` : '';
executionName += (!['done', 'closed', 'suspended'].includes(row.data.status) && today > row.data.end) ? '<span class="label danger-pale ml-1 flex-none">' + delayWarning.replace('%s', row.data.delay) + '</span>' : '';
result.push({html: executionName, className: 'w-full flex items-center'});
return result;
module/execution/ui/all.html.php
+1 -1
View File
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace zin;
jsVar('typeList', $lang->execution->typeList);
jsVar('delayed', $lang->execution->delayed);
jsVar('delayWarning', $lang->task->delayWarning);
jsVar('confirmBatchCloseExecution', $lang->execution->confirmBatchCloseExecution);
$footToolbar = array();
module/my/js/execution.ui.js
+1 -1
View File
@@ -10,7 +10,7 @@ window.onRenderExecutionCell = function(result, info)
executionName += '<div class="ml-1 clip" style="width: max-content;">';
executionName += (!info.row.data.isParent && typeof result[0] != 'string') ? `<a href="${executionLink}" class="text-primary">${info.row.data.name}</a>` : info.row.data.name;
executionName += '</div>';
executionName += (!['done', 'closed', 'suspended'].includes(info.row.data.status) && today > info.row.data.end) ? `<span class="label danger-pale ml-1 flex-none">${delayed}</span>` : '';
executionName += (!['done', 'closed', 'suspended'].includes(info.row.data.status) && today > info.row.data.end) ? '<span class="label danger-pale ml-1 flex-none">' + delayWarning.replace('%s', info.row.data.delay) + '</span>' : '';
result[0] = {html: executionName, className: 'w-full flex items-center'};
return result;
module/my/ui/execution.html.php
+1 -1
View File
@@ -12,7 +12,7 @@ namespace zin;
jsVar('systemMode', $config->systemMode);
jsVar('typeList', $lang->execution->typeList);
jsVar('delayed', $lang->execution->delayed);
jsVar('delayWarning', $lang->task->delayWarning);
featurebar
(
module/project/js/browse.ui.js
+1 -1
View File
@@ -10,7 +10,7 @@ window.renderCell = function(result, {col, row})
if(row.data.delay > 0)
{
result[0].props.className = 'overflow-hidden';
result[result.length] = {html:'<span class="label danger-pale ml-1 flex-none nowrap">' + langPostponed + '</span>', className:'flex items-end', style:{flexDirection:"column"}};
result[result.length] = {html:'<span class="label danger-pale ml-1 flex-none nowrap">' + delayWarning.replace('%s', row.data.delay) + '</span>', className:'flex items-end', style:{flexDirection:"column"}};
}
return result;
}
module/project/js/execution.ui.js
+1 -1
View File
@@ -54,7 +54,7 @@ window.onRenderCell = function(result, {col, row})
executionName += '<div class="ml-1 clip flex items-center" style="width: max-content;">';
executionName += (executionType !== undefined && !row.data.isParent) ? `<a href="${executionLink}" class="text-primary">${row.data.name}</a>` : row.data.name;
executionName += '</div>';
executionName += (!['done', 'closed', 'suspended'].includes(row.data.status) && row.data.type != 'point' && row.data.end != '' && today > row.data.end) ? `<span class="label danger-pale ml-1 flex-none">${delayed}</span>` : '';
executionName += (!['done', 'closed', 'suspended'].includes(row.data.status) && row.data.type != 'point' && row.data.end != '' && today > row.data.end) ? '<span class="label danger-pale ml-1 flex-none">' + (typeof row.data.delay != 'undefined' ? delayWarning.replace('%s', row.data.delay) : delayed) + '</span>' : '';
result.push({html: executionName, className: 'w-full flex items-center'});
return result;
module/project/ui/browsebylist.html.php
+2 -2
View File
@@ -10,8 +10,8 @@ declare(strict_types=1);
*/
namespace zin;
jsVar('langManDay', $lang->program->manDay);
jsVar('langPostponed', $lang->project->statusList['delay']);
jsVar('langManDay', $lang->program->manDay);
jsVar('delayWarning', $lang->task->delayWarning);
/* zin: Define the feature bar on main menu. */
featureBar
module/project/ui/execution.html.php
+1
View File
@@ -18,6 +18,7 @@ jsVar('orderBy', $orderBy);
jsVar('productID', $productID);
jsVar('typeList', $lang->execution->typeList);
jsVar('delayed', $lang->execution->delayed);
jsVar('delayWarning', $lang->task->delayWarning);
jsVar('pageExecSummary', $lang->execution->pageExecSummary);
jsVar('checkedExecSummary', $lang->execution->checkedExecSummary);