UI: Fix circulation policies editor #363

* Closes #363
* structure editor with section.
* add overdue amount and currency in circ policies editor.
* add an allow renewals button calculated dynamically.

Co-Authored-by: Laurent Dubois <laurent.dubois@itld-solutions.be>
Co-Authored-by: Renaud Michotte <renaud.michotte@gmail.com>

ui/src/app/records/custom-editor/circulation-settings/circulation-policy-form.service.ts

@@ -49,6 +49,7 @@ export class CirculationPolicyFormService {
       allow_requests: circulation.allow_requests,
       number_renewals: circulation.number_renewals,
       renewal_duration: circulation.renewal_duration,
+      overdue_amount: circulation.overdue_amount,
       policy_library_level: circulation.policy_library_level,
       is_default: circulation.is_default,
       settings: this.unserializeSettings(circulation.settings)
@@ -76,8 +77,10 @@ export class CirculationPolicyFormService {
       checkout_duration: [7],
       number_of_days_after_due_date: [5],
       number_of_days_before_due_date: [5],
+      allow_renewals: [true],
       number_renewals: [0],
       renewal_duration: [null],
+      overdue_amount: [0],
       policy_library_level: [false],
       is_default: [],
       libraries: [],
@@ -90,16 +93,13 @@ export class CirculationPolicyFormService {
     const numberRenewalsControl = this.getControlByFieldName('number_renewals');
     const daysAfterControl = this.getControlByFieldName('number_of_days_after_due_date');
     const daysBeforeControl = this.getControlByFieldName('number_of_days_before_due_date');
+    const overdueAmountControl = this.getControlByFieldName('overdue_amount');
     this.form.get('allow_checkout').valueChanges.subscribe(checkout => {
       if (checkout) {
         checkoutDurationControl.setValidators([
           Validators.required,
           Validators.min(1)
         ]);
-        numberRenewalsControl.setValidators([
-          Validators.required,
-          Validators.min(0)
-        ]);
         daysAfterControl.setValidators([
           Validators.required,
           Validators.min(1)
@@ -108,10 +108,26 @@ export class CirculationPolicyFormService {
           Validators.required,
           Validators.min(1)
         ]);
+        overdueAmountControl.setValidators([
+          Validators.required,
+          Validators.min(0)
+        ]);
       } else {
         checkoutDurationControl.clearValidators();
         numberRenewalsControl.clearValidators();
         daysAfterControl.clearValidators();
+        daysBeforeControl.clearValidators();
+        overdueAmountControl.clearValidators();
+      }
+    });
+    this.form.get('allow_renewals').valueChanges.subscribe(renewals => {
+      if (renewals) {
+        numberRenewalsControl.setValidators([
+          Validators.required,
+          Validators.min(0)
+        ]);
+      } else {
+        numberRenewalsControl.clearValidators();
       }
     });
     const renewalDuration = this.getControlByFieldName('renewal_duration');
@@ -133,6 +149,8 @@ export class CirculationPolicyFormService {
 
   getValues() {
     const formValues = this.form.value;
+    // delete calculate field before returns values of form
+    formValues.allow_renewals = null;
     formValues.libraries = this.serializeLibraries(formValues.libraries);
     formValues.settings = this.serializeSettings(formValues.settings);
     return formValues;

ui/src/app/records/custom-editor/circulation-settings/circulation-policy.ts

@@ -35,6 +35,7 @@ export class CirculationPolicy {
   number_of_days_before_due_date: number = null;
   number_renewals: number = null;
   renewal_duration: number = null;
+  overdue_amount: number = null;
   policy_library_level: boolean = null;
   is_default: boolean = null;
   libraries: Array<any> = [];
@@ -54,6 +55,7 @@ export class CirculationPolicy {
     this.number_of_days_after_due_date = 5;
     this.number_of_days_before_due_date = 5;
     this.number_renewals = 0;
+    this.overdue_amount = 0;
     this.policy_library_level = false;
     this.is_default = false;
     this.organisation = {