浏览代码

latest changes are

Sai Sudheer 2 年前
父节点
当前提交
7451aaa715
共有 4 个文件被更改,包括 5727 次插入22 次删除
  1. 75
    20
      assets/js/list.index.js
  2. 5649
    0
      assets/js/moment/moment.js
  3. 2
    2
      assets/js/setting.js
  4. 1
    0
      authentication/index.html

+ 75
- 20
assets/js/list.index.js 查看文件

4
 import {_serverUrl} from "./setting.js";
4
 import {_serverUrl} from "./setting.js";
5
 export var connection;
5
 export var connection;
6
 
6
 
7
+export function dateTimeFormat(dateTime) {
8
+  var date = moment.utc(dateTime).local();
9
+  var difmonths = moment().diff(date, "months");
10
+  if (difmonths == 0) {
11
+    return moment(dateTime).fromNow();
12
+  }
13
+  return date.format("DD MMM, YYYY HH:mm");
14
+}
7
 function createLoad(data) {
15
 function createLoad(data) {
8
   let html = "";
16
   let html = "";
9
   if (data.length != 0) {
17
   if (data.length != 0) {
157
       // Notifcations
165
       // Notifcations
158
       let bdyUI = '<div class="accordion" id="notifi-list">';
166
       let bdyUI = '<div class="accordion" id="notifi-list">';
159
       for (var i = 0; i < response.length; i++) {
167
       for (var i = 0; i < response.length; i++) {
160
-        bdyUI += `<li class="item-li" id="${response[i].ReminderId}" data-ref="${response[i].RedirectOptions.RefId}" data-installedAppId="${response[i].RedirectOptions.InstalledAppId}" data-formId="${response[i].RedirectOptions.CreateFormId}">
161
-                            <div class="accordion-header" id="accHeader-${response[i].ReminderId}">
162
-                                <div class="notifiListItms accordion-button collapsed" data-bs-toggle="collapse"  data-bs-target="#collapse-${response[i].ReminderId}" aria-expanded="false" aria-controls="collapseOne">
168
+        bdyUI += `<li class="item-li" id="${
169
+          response[i].ReminderId
170
+        }" data-ref="${
171
+          response[i].RedirectOptions.RefId
172
+        }" data-installedAppId="${
173
+          response[i].RedirectOptions.InstalledAppId
174
+        }" data-formId="${response[i].RedirectOptions.CreateFormId}">
175
+                            <div class="accordion-header" id="accHeader-${
176
+                              response[i].ReminderId
177
+                            }">
178
+                                <div class="notifiListItms accordion-button collapsed" data-bs-toggle="collapse"  data-bs-target="#collapse-${
179
+                                  response[i].ReminderId
180
+                                }" aria-expanded="false" aria-controls="collapseOne">
163
                                     <div class="row m-0 w-100 p-0 ">
181
                                     <div class="row m-0 w-100 p-0 ">
164
                                         <div class="col-3 px-0  d-flex flex-row text-truncate">
182
                                         <div class="col-3 px-0  d-flex flex-row text-truncate">
165
                                             <input class="form-check-input mr-2" type="checkbox" value="" id="flexCheckDefault">
183
                                             <input class="form-check-input mr-2" type="checkbox" value="" id="flexCheckDefault">
166
                                             <div class="mx-3 w-75 text-truncate">
184
                                             <div class="mx-3 w-75 text-truncate">
167
-                                              <span class="mx-1">${response[i].Subject}</span>
185
+                                              <span class="mx-1">${
186
+                                                response[i].Subject
187
+                                              }</span>
168
                                             </div>
188
                                             </div>
169
                                         </div>
189
                                         </div>
170
                                         <div class="col-9 text-truncate d-flex justify-content-between">
190
                                         <div class="col-9 text-truncate d-flex justify-content-between">
171
-                                            <span class="mx-1 w-mes">${response[i].Message}</span>
172
-                                            <span class="mx-1 t-sec-min">22 mins</span>
191
+                                            <span class="mx-1 w-mes">${
192
+                                              response[i].Message
193
+                                            }</span>
194
+                                            <span class="mx-1 t-sec-min">${dateTimeFormat(
195
+                                              response[i].ReminderDate
196
+                                            )}</span>
173
                                         </div>
197
                                         </div>
174
                                     </div>    
198
                                     </div>    
175
                                 </div>
199
                                 </div>
176
-                                <div id="collapse-${response[i].ReminderId}"  class="accordion-collapse collapse" aria-labelledby="accHeader-${response[i].ReminderId}" data-bs-parent="#notifi-list">
177
-                                    <div class="accordion-body" id="accBody${response[i].ReminderId}">
200
+                                <div id="collapse-${
201
+                                  response[i].ReminderId
202
+                                }"  class="accordion-collapse collapse" aria-labelledby="accHeader-${
203
+          response[i].ReminderId
204
+        }" data-bs-parent="#notifi-list">
205
+                                    <div class="accordion-body" id="accBody${
206
+                                      response[i].ReminderId
207
+                                    }">
178
                                         
208
                                         
179
                                     </div>
209
                                     </div>
180
                                 </div>
210
                                 </div>
185
       $(".bdy-ul").append(bdyUI);
215
       $(".bdy-ul").append(bdyUI);
186
       $('.sub-nav-item[data-buttonType="inbox"] .length').remove();
216
       $('.sub-nav-item[data-buttonType="inbox"] .length').remove();
187
       $('.sub-nav-item[data-buttonType="inbox"]').append(
217
       $('.sub-nav-item[data-buttonType="inbox"]').append(
188
-        `<span class="length badge rounded-pill bg-light text-dark ml-auto">${
189
-          $(".item-li").length
190
-        }</span>`
218
+        `<span class="length badge rounded-pill bg-light text-dark ml-auto"></span>`
191
       );
219
       );
192
       $(".notifiListItms").on("click", function () {
220
       $(".notifiListItms").on("click", function () {
193
         let _this = $(this).parents(".item-li");
221
         let _this = $(this).parents(".item-li");
264
     if (response.length != 0) {
292
     if (response.length != 0) {
265
       let _tskhtml = '<div class="accordion" id="task-list">';
293
       let _tskhtml = '<div class="accordion" id="task-list">';
266
       for (var i = 0; i < response.length; i++) {
294
       for (var i = 0; i < response.length; i++) {
267
-        _tskhtml += `<li class="item-li" id="${response[i].ReminderId}" data-ref="${response[i].RedirectOptions.RefId}" data-installedAppId="${response[i].RedirectOptions.InstalledAppId}" data-formId="${response[i].RedirectOptions.CreateFormId}">
268
-                                <div class="accordion-header" id="accHeader-${response[i].ReminderId}">
269
-                                    <div class="tskListItms accordion-button collapsed" data-bs-toggle="collapse"  data-bs-target="#collapse-${response[i].ReminderId}" aria-expanded="false" aria-controls="collapseOne">
295
+        _tskhtml += `<li class="item-li" id="${
296
+          response[i].ReminderId
297
+        }" data-ref="${
298
+          response[i].RedirectOptions.RefId
299
+        }" data-installedAppId="${
300
+          response[i].RedirectOptions.InstalledAppId
301
+        }" data-formId="${response[i].RedirectOptions.CreateFormId}">
302
+                                <div class="accordion-header" id="accHeader-${
303
+                                  response[i].ReminderId
304
+                                }">
305
+                                    <div class="tskListItms accordion-button collapsed" data-bs-toggle="collapse"  data-bs-target="#collapse-${
306
+                                      response[i].ReminderId
307
+                                    }" aria-expanded="false" aria-controls="collapseOne">
270
                                         <div class="row m-0 w-100 p-0 ">
308
                                         <div class="row m-0 w-100 p-0 ">
271
                                             <div class="col-3 px-0  d-flex flex-row text-truncate">
309
                                             <div class="col-3 px-0  d-flex flex-row text-truncate">
272
                                                 <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
310
                                                 <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
273
                                                 <div class="mx-3 w-75 text-truncat">
311
                                                 <div class="mx-3 w-75 text-truncat">
274
-                                                  <span class="mx-1">${response[i].Subject}</span>
312
+                                                  <span class="mx-1">${
313
+                                                    response[i].Subject
314
+                                                  }</span>
275
                                                 </div>
315
                                                 </div>
276
                                             </div>
316
                                             </div>
277
                                             <div class="col-9 text-truncate d-flex justify-content-between">
317
                                             <div class="col-9 text-truncate d-flex justify-content-between">
278
-                                                <span class="mx-1 w-mes">${response[i].Message}</span>
279
-                                                <span class="mx-1 t-sec-min">22 mins</span>
318
+                                                <span class="mx-1 w-mes">${
319
+                                                  response[i].Message
320
+                                                }</span>
321
+                                                <span class="mx-1 t-sec-min">${dateTimeFormat(
322
+                                                  response[i].ReminderDate
323
+                                                )}</span>
280
                                             </div>
324
                                             </div>
281
                                         </div>    
325
                                         </div>    
282
                                     </div>
326
                                     </div>
283
-                                    <div id="collapse-${response[i].ReminderId}"  class="accordion-collapse collapse" aria-labelledby="accHeader-${response[i].ReminderId}" data-bs-parent="#notifi-list">
284
-                                        <div class="accordion-body" id="accBody${response[i].ReminderId}">
327
+                                    <div id="collapse-${
328
+                                      response[i].ReminderId
329
+                                    }"  class="accordion-collapse collapse" aria-labelledby="accHeader-${
330
+          response[i].ReminderId
331
+        }" data-bs-parent="#notifi-list">
332
+                                        <div class="accordion-body" id="accBody${
333
+                                          response[i].ReminderId
334
+                                        }">
285
                                             <ul class="p-0 m-0 d-flex flex-row justify-content-between">
335
                                             <ul class="p-0 m-0 d-flex flex-row justify-content-between">
286
                                                 <li class="mx-2 btn-outline-success btn btn-sm">Confirm</li>
336
                                                 <li class="mx-2 btn-outline-success btn btn-sm">Confirm</li>
287
                                                 <li class="mx-2 btn-outline-danger btn btn-sm">Reject</li>
337
                                                 <li class="mx-2 btn-outline-danger btn btn-sm">Reject</li>
288
                                                 <li class="mx-2 btn-outline-primary btn btn-sm">Close</li>
338
                                                 <li class="mx-2 btn-outline-primary btn btn-sm">Close</li>
289
-                                                <li class="mx-2 btn-outline-info detailBtn btn btn-sm" data-appId="${response[i].RedirectOptions.InstalledAppId}" data-recordId="${response[i].RedirectOptions.RefId}">Details-Page</li>
339
+                                                <li class="mx-2 btn-outline-info detailBtn btn btn-sm" data-appId="${
340
+                                                  response[i].RedirectOptions
341
+                                                    .InstalledAppId
342
+                                                }" data-recordId="${
343
+          response[i].RedirectOptions.RefId
344
+        }">Details-Page</li>
290
                                             </ul>
345
                                             </ul>
291
                                         </div>
346
                                         </div>
292
                                     </div>
347
                                     </div>

+ 5649
- 0
assets/js/moment/moment.js
文件差异内容过多而无法显示
查看文件


+ 2
- 2
assets/js/setting.js 查看文件

2
   // sachin 2.0 commitw
2
   // sachin 2.0 commitw
3
   // sudheer 1.0 new branch
3
   // sudheer 1.0 new branch
4
   // merge request another time
4
   // merge request another time
5
-  //return "http://localhost:3088/";
5
+  return "http://localhost:3088/";
6
   //return "http://localhost:3086/";
6
   //return "http://localhost:3086/";
7
-  return "https://c02.bizgaze.app/";
7
+  //return "https://c02.bizgaze.app/";
8
   //return "https://dev.bizgaze.app/";
8
   //return "https://dev.bizgaze.app/";
9
 }
9
 }

+ 1
- 0
authentication/index.html 查看文件

15
     <script src="../assets/js/bootstrap/bootstrap.bundle.min.js" defer></script>
15
     <script src="../assets/js/bootstrap/bootstrap.bundle.min.js" defer></script>
16
     <script src="../assets/js/cryptojs/cryptojs.js" defer></script>
16
     <script src="../assets/js/cryptojs/cryptojs.js" defer></script>
17
     <script src="../assets/js/signalr/signalr.js" defer></script>
17
     <script src="../assets/js/signalr/signalr.js" defer></script>
18
+    <script src="../assets/js/moment/moment.js" defer></script>
18
     <script type="module" src="../assets/js/home.js" defer></script>
19
     <script type="module" src="../assets/js/home.js" defer></script>
19
     <!-- <script src="../assets/js/cookiehelper.js"></script> -->
20
     <!-- <script src="../assets/js/cookiehelper.js"></script> -->
20
     <!-- <script src="../assets/js/base.js" defer></script> -->
21
     <!-- <script src="../assets/js/base.js" defer></script> -->

正在加载...
取消
保存