From a2fe525436d8117c0df50647d07d187430e993cf Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 27 Jun 2022 08:49:35 +0000 Subject: [PATCH 1/3] * Finish task#58598. --- module/testtask/css/edit.css | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 module/testtask/css/edit.css diff --git a/module/testtask/css/edit.css b/module/testtask/css/edit.css new file mode 100644 index 0000000000..0365ca67dc --- /dev/null +++ b/module/testtask/css/edit.css @@ -0,0 +1,2 @@ +#mailtoGroup .chosen-container-single a {border-left-width: 0px;} +#ownerAndPriBox .picker .picker-selections .picker-selection {width: 158px;} From f8087acd1da33874ddd3141c39e6c2f9dfae2ec9 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 27 Jun 2022 08:49:52 +0000 Subject: [PATCH 2/3] * Finish task#58598. --- module/my/css/project.css | 3 ++- module/my/view/project.html.php | 2 +- module/webhook/lang/de.php | 9 ++++++--- module/webhook/lang/fr.php | 9 ++++++--- module/webhook/view/choosedept.html.php | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/module/my/css/project.css b/module/my/css/project.css index cae5e90bc8..850d58003c 100644 --- a/module/my/css/project.css +++ b/module/my/css/project.css @@ -1,9 +1,10 @@ #projectTableList > tr.drop-not-allowed {opacity: 0.1 !important;} #projectList .c-actions {overflow: visible;} #projectTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;} +#projectList .c-budget {width: 100px; padding-right: 20px;} +#projectTableList .c-budget {width: 100px; padding-right: 20px;} .c-date {width: 80px;} -.c-budget {width: 80px;} .label-warning, .label-info {width: 60px !important;} .project-type-label.label-outline {width: 50px; min-width: 50px;} .c-date {width: 120px;} diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 6c67c0bb8b..f88cb9afaf 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -64,7 +64,7 @@ begin;?> end == LONG_TIME ? $this->lang->project->longTime : $project->end;?> app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> - budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?> + budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?> PM]) ? $PMList[$project->PM]->id : ''?> PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?> diff --git a/module/webhook/lang/de.php b/module/webhook/lang/de.php index 902b653a14..e9005798bc 100644 --- a/module/webhook/lang/de.php +++ b/module/webhook/lang/de.php @@ -87,6 +87,8 @@ $lang->webhook->paramsList['comment'] = 'Kommentar'; $lang->webhook->paramsList['text'] = 'Aktionsbeschreibung'; $lang->webhook->confirmDelete = 'Möchten Sie diesen Hook löschen?'; +$lang->webhook->friendlyTips = 'Friendly reminder: Click on a department to expand the sub-departments under the department.'; +$lang->webhook->loadPrompt = 'There is a lot of data and the loading is slow, please wait.'; $lang->webhook->trimWords = ''; @@ -104,6 +106,7 @@ $lang->webhook->note->typeList['dingding'] = 'Fügen Sie einen eigenen bot in d $lang->webhook->note->typeList['weixin'] = 'Add a customized bot in WeChat and get the webhook url.'; $lang->webhook->note->typeList['default'] = 'Webhookadresse on anderen erhalten.'; -$lang->webhook->error = new stdclass(); -$lang->webhook->error->curl = 'Laden Sie php-curl in der php.ini.'; -$lang->webhook->error->noDept = 'There is no department selected. Please choose department first.'; +$lang->webhook->error = new stdclass(); +$lang->webhook->error->curl = 'Laden Sie php-curl in der php.ini.'; +$lang->webhook->error->noDept = 'There is no department selected. Please choose department first.'; +$lang->webhook->error->requestError = 'Request error!'; diff --git a/module/webhook/lang/fr.php b/module/webhook/lang/fr.php index 09272d15a6..0731190129 100644 --- a/module/webhook/lang/fr.php +++ b/module/webhook/lang/fr.php @@ -87,6 +87,8 @@ $lang->webhook->paramsList['comment'] = 'Commentaire'; $lang->webhook->paramsList['text'] = "Description de l'Action"; $lang->webhook->confirmDelete = 'Voulez-vous vraiment supprimer ce flux ?'; +$lang->webhook->friendlyTips = 'Friendly reminder: Click on a department to expand the sub-departments under the department.'; +$lang->webhook->loadPrompt = 'There is a lot of data and the loading is slow, please wait.'; $lang->webhook->trimWords = ''; @@ -104,6 +106,7 @@ $lang->webhook->note->typeList['dingding'] = "Ajout d'un bot personnalis $lang->webhook->note->typeList['weixin'] = "Ajoutez un bot personnalisé dans WeChat et obtenez l'url du webhook."; $lang->webhook->note->typeList['default'] = "Obtenir les url d'autres flux webhook."; -$lang->webhook->error = new stdclass(); -$lang->webhook->error->curl = 'Chargez php-curl dans php.ini.'; -$lang->webhook->error->noDept = 'There is no department selected. Please choose department first.'; +$lang->webhook->error = new stdclass(); +$lang->webhook->error->curl = 'Chargez php-curl dans php.ini.'; +$lang->webhook->error->noDept = 'There is no department selected. Please choose department first.'; +$lang->webhook->error->requestError = 'Request error!'; diff --git a/module/webhook/view/choosedept.html.php b/module/webhook/view/choosedept.html.php index 28d91d7cc4..46f061fd34 100644 --- a/module/webhook/view/choosedept.html.php +++ b/module/webhook/view/choosedept.html.php @@ -51,7 +51,7 @@ $(function() { enable: true, chkStyle: "checkbox", - chkboxType: {"Y" : "s", "N" : "s"} + chkboxType: {"Y" : "ps", "N" : "ps"} }, data: { @@ -176,7 +176,7 @@ $(function() { enable: true, chkStyle: "checkbox", - chkboxType: {"Y":"s", "N":"s"} + chkboxType: {"Y" : "ps", "N" : "ps"} }, data: { From 808d67b8790f389522d564f20aaca3a8e362d9b5 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 27 Jun 2022 10:32:20 +0000 Subject: [PATCH 3/3] * Adjust code. --- module/my/control.php | 1 - module/my/css/task.css | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/module/my/control.php b/module/my/control.php index 7d96f5344c..9ff1bf6426 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -453,7 +453,6 @@ EOF; $this->loadModel('execution'); $queryID = ($type == 'bySearch') ? (int)$param : 0; - /* Save session. */ if($type != 'bySearch') $this->session->set('myTaskType', $type); if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution'); diff --git a/module/my/css/task.css b/module/my/css/task.css index b2bdee3a98..22a28dbcc9 100644 --- a/module/my/css/task.css +++ b/module/my/css/task.css @@ -17,3 +17,4 @@ td.delayed {background: #e84e0f !important; color: white;} .c-hours {width: 50px;} .c-status, .c-date, .c-user-short {width: 70px;} .c-project {width: 130px;} +#taskTable .c-user{width: 110px; padding-left: 29px;}