#9794 add color picker for config option

src/main/java/com/divudi/bean/collectingCentre/CollectingCentreBillController.java

@@ -258,6 +258,8 @@ public class CollectingCentreBillController implements Serializable, ControllerW
     private YearMonthDay yearMonthDay;
     private PaymentMethodData paymentMethodData;
 
+    private String externalDoctor;
+
     public List<AgentReferenceBook> getAgentReferenceBooks() {
         return agentReferenceBooks;
     }
@@ -269,7 +271,7 @@ public double findCCBalanceAfterBilling(Bill bill) {
                 + " where ah.bill =:b "
                 + " and ah.bill.retired=false ";
         params.put("b", bill);
-        
+
         AgentHistory history = agentHistoryFacade.findFirstByJpql(jpql, params);
         System.out.println("history = " + history);
         double billingAfterCCBalance = history.getBalanceAfterTransaction();
@@ -1170,6 +1172,7 @@ private Bill createCcBill(Department bt) {
         ccBill.setFromInstitution(collectingCentre);
 
         ccBill.setReferredBy(referredBy);
+        ccBill.setExternalDoctor(externalDoctor);
         ccBill.setReferenceNumber(referralId);
         ccBill.setReferredByInstitution(referredByInstitution);
         ccBill.setComments(comment);
@@ -1603,6 +1606,7 @@ public void prepareNewBill() {
         paymentMethod = PaymentMethod.Agent;
         collectingCentre = null;
         opdItems = null;
+        externalDoctor = null;
     }
 
     public void prepareNewBillKeepingCollectingCenter() {
@@ -2550,6 +2554,14 @@ public void listnerForPaymentMethodChange() {
         // ToDo: Add Logic
     }
 
+    public String getExternalDoctor() {
+        return externalDoctor;
+    }
+
+    public void setExternalDoctor(String externalDoctor) {
+        this.externalDoctor = externalDoctor;
+    }
+
     public class CollectingCenterBookSummeryRow {
 
         private String bookName;

src/main/java/com/divudi/bean/common/ConfigOptionApplicationController.java

@@ -291,8 +291,44 @@ public String getShortTextValueByKey(String key, String defaultValue) {
         }
         return option.getOptionValue();
     }
+
+    public String getColorValueByKey(String key) {
+        ConfigOption option = getApplicationOption(key);
+        if (option == null || option.getValueType() != OptionValueType.COLOR) {
+            option = new ConfigOption();
+            option.setCreatedAt(new Date());
+            option.setOptionKey(key);
+            option.setScope(OptionScope.APPLICATION);
+            option.setInstitution(null);
+            option.setDepartment(null);
+            option.setWebUser(null);
+            option.setValueType(OptionValueType.COLOR);
+            option.setOptionValue("");
+            optionFacade.create(option);
+            loadApplicationOptions();
+        }
+        return option.getOptionValue();
+    }
+
+    public String getColorValueByKey(String key, String defaultColorHashCode) {
+        ConfigOption option = getApplicationOption(key);
+        if (option == null || option.getValueType() != OptionValueType.COLOR) {
+            option = new ConfigOption();
+            option.setCreatedAt(new Date());
+            option.setOptionKey(key);
+            option.setScope(OptionScope.APPLICATION);
+            option.setInstitution(null);
+            option.setDepartment(null);
+            option.setWebUser(null);
+            option.setValueType(OptionValueType.COLOR);
+            option.setOptionValue(defaultColorHashCode);
+            optionFacade.create(option);
+            loadApplicationOptions();
+        }
+        return option.getOptionValue();
+    }
 
-    public String getEnumValueByKey(String key) {
+    public String getEnumValueByKey(String key ) {
         ConfigOption option = getApplicationOption(key);
         if (option == null || option.getValueType() != OptionValueType.ENUM) {
             option = new ConfigOption();