From 7271ae38f84dc6b811ff85a18a7bcfbc00f2eccf Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 14 Jun 2021 15:52:14 +0800
Subject: [PATCH] added data sort to FDD messages in Admin UI

---
 admin/views/fdd/emailmessage.html  | 10 +++++-----
 admin/views/fdd/textmessage.html   | 11 ++++++-----
 admin/views/fdd/wechatmessage.html |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html
index 8fea719c..d1ce6262 100644
--- a/admin/views/fdd/emailmessage.html
+++ b/admin/views/fdd/emailmessage.html
@@ -33,11 +33,11 @@
                                         <th class="text-center">{{'FDD.ID' | translate}}</th>
                                         <th class="text-center">{{'FDD.RECIPIENT_NAME' | translate}}</th>
                                         <th data-sort-ignore="true" class="text-center">{{'FDD.EMAIL' | translate}}</th>
-                                        <th data-sort-ignore="true" class="text-center">{{'FDD.TOPIC' | translate}}</th>
+                                        <th class="text-center">{{'FDD.TOPIC' | translate}}</th>
                                         <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_MESSAGE' | translate}}</th>
                                         <th data-sort-ignore="true" class="text-center">{{'FDD.ATTACHMENT_NAME' | translate}}</th>
-                                        <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
-                                        <th data-sort-ignore="true" class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
+                                        <th class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
+                                        <th class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
                                         <th class="text-center">{{'SETTING.STATUS' | translate}}</th>
                                         <th data-sort-ignore="true" class="text-center">{{'SETTING.ACTION' | translate}}</th>
                                     </tr>
@@ -53,8 +53,8 @@
                                             <td class="text-center sm">{{ row.created_datetime | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
                                             <td class="text-center sm">{{ row.scheduled_datetime | date:'yyyy-MM-ddTHH:mm:ss'}}</td>
                                             <td class="text-center sm">{{ row.status }}</td>
-                                            <td class="text-center"> 
-                                                <a ng-click="deleteEmailMessage(row)" 
+                                            <td class="text-center">
+                                                <a ng-click="deleteEmailMessage(row)"
                                                     class="btn btn-danger btn-rounded btn-xs">{{'SETTING.DELETE' | translate}}</a> </td>
                                         </tr>
                                     </tbody>
diff --git a/admin/views/fdd/textmessage.html b/admin/views/fdd/textmessage.html
index 62de8d6a..60379cc5 100644
--- a/admin/views/fdd/textmessage.html
+++ b/admin/views/fdd/textmessage.html
@@ -21,19 +21,20 @@
             <div class="col-lg-12">
                 <div class="tabs-container">
                     <uib-tabset>
-                        <uib-tab heading="{{'FDD.SMS_ALARM_LIST' | translate}}">                       
+                        <uib-tab heading="{{'FDD.SMS_ALARM_LIST' | translate}}">
                             <div class="panel-body" ng-controller="TextMessageController">
                                 <input type="text" class="form-control m-b-xs" id="textmessagefilter"
                                     placeholder="{{'SETTING.SEARCH' | translate}}">
-                                <table id="textmessageTable" class="footable table table-bordered table-hover" data-sort="true" data-empty="There are no rows"  data-page-size="20" data-filter="#textmessagefilter">
+                                <table id="textmessageTable" class="footable table table-bordered table-hover" data-sort="true"
+                                       data-empty="There are no rows"  data-page-size="20" data-filter="#textmessagefilter">
                                     <thead>
                                         <tr >
                                             <th class="text-center">{{'FDD.ID' | translate}}</th>
                                             <th class="text-center">{{'FDD.RECIPIENT_NAME' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.RECIPIENT_MOBILE' | translate}}</th>
+                                            <th class="text-center">{{'FDD.RECIPIENT_MOBILE' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_MESSAGE' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
+                                            <th class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
+                                            <th class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'FDD.ACKNOWLEDGE_CODE' | translate}}</th>
                                             <th class="text-center">{{'SETTING.STATUS' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'SETTING.ACTION' | translate}}</th>
diff --git a/admin/views/fdd/wechatmessage.html b/admin/views/fdd/wechatmessage.html
index c9ae3341..5695a74f 100644
--- a/admin/views/fdd/wechatmessage.html
+++ b/admin/views/fdd/wechatmessage.html
@@ -30,11 +30,11 @@
                                         <tr >
                                             <th class="text-center">{{'FDD.ID' | translate}}</th>
                                             <th class="text-center">{{'FDD.RECIPIENT_NAME' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.WECHAT_ID' | translate}}</th>
+                                            <th class="text-center">{{'FDD.WECHAT_ID' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'FDD.MESSAGE_FORMAT' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_MESSAGE' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
-                                            <th data-sort-ignore="true" class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
+                                            <th class="text-center">{{'FDD.ALARM_TIME' | translate}}</th>
+                                            <th class="text-center">{{'FDD.SCHEDULE_TIME' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'FDD.ACKNOWLEDGE_CODE' | translate}}</th>
                                             <th class="text-center">{{'SETTING.STATUS' | translate}}</th>
                                             <th data-sort-ignore="true" class="text-center">{{'SETTING.ACTION' | translate}}</th>