From ed7b8b75a29bf88573ab12d94652177328a850e8 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 12 Aug 2020 12:18:40 +1000
Subject: [PATCH] valid calendar warning level

---
 .../management/clearing/core/impl/CleanServiceImpl.java     | 5 +++++
 .../static/payment/validation/templates/valid-calendar.html | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index 310aaacc6..2880b4554 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -170,6 +170,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             JSONObject item = new JSONObject();
             item.put("date", DateFormatUtils.format(report.getDate("valid_date"), "yyyy/MM/dd"));
             JSONObject result = JSON.parseObject(report.getString("result"));
+            int warningLevel = result.getBooleanValue("valid") ? 0 : 1;
+            if (!result.getJSONArray("not_exists").isEmpty()) {
+                warningLevel = 2;
+            }
+            item.put("warning_level", warningLevel);
             item.put("success", result.getBooleanValue("valid"));
             topReports.add(item);
         }
diff --git a/src/main/ui/static/payment/validation/templates/valid-calendar.html b/src/main/ui/static/payment/validation/templates/valid-calendar.html
index 7a89f9ad7..232e60798 100644
--- a/src/main/ui/static/payment/validation/templates/valid-calendar.html
+++ b/src/main/ui/static/payment/validation/templates/valid-calendar.html
@@ -11,8 +11,10 @@
         <div class="box">
             <div class="box-body">
                 <div royal-calendar month-change="loadValidatedDates($month)">
-                    <a class="rc-full" role="button" ui-sref=".report({date:(day|date:'yyyyMMdd')})" style="font-size: 40px" ng-if="day<=today">
-                        <i class="fa" ng-class="{'fa-check-circle text-green':findReport((day|date:'yyyy/MM/dd')).success,'fa-warning text-red':!findReport((day|date:'yyyy/MM/dd')).success}"
+                    <a class="rc-full" role="button" ui-sref=".report({date:(day|date:'yyyyMMdd')})"
+                       style="font-size: 40px" ng-if="day<=today">
+                        <i class="fa"
+                           ng-class="{'fa-check-circle text-green':findReport((day|date:'yyyy/MM/dd')).success,'fa-warning':!findReport((day|date:'yyyy/MM/dd')).success,'text-red':findReport((day|date:'yyyy/MM/dd')).warning_level==2,'text-yellow':findReport((day|date:'yyyy/MM/dd')).warning_level==1}"
                            ng-if="findReport((day|date:'yyyy/MM/dd'))!=null"></i>
                     </a>
                 </div>