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] * 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 @@
           <td class='text-left'><?php echo $project->begin;?></td>
           <td class='text-left'><?php echo $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;?></td>
           <?php $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?>
-          <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?></td>
+          <td class='text-right c-budget'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?></td>
           <td>
             <?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
             <?php if(!empty($project->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:
             {