budget: update entities budget and acq_account for new formly component

babel.ini

@@ -38,4 +38,4 @@ extract_messages = $._, jQuery._
 
 # Extraction from json files (schema, form)
 [json: **.json]
-keys_to_translate = ['^title$', 'description', 'placeholder', 'validationMessage', 'name', 'add', '403', '.*Message']
+keys_to_translate = ['^title$', 'label', 'description', 'placeholder', 'validationMessage', 'name', 'add', '403', '.*Message']

rero_ils/config.py

@@ -1160,6 +1160,7 @@ def _(x):
 # ===========================
 RERO_ILS_BABEL_TRANSLATE_JSON_KEYS = [
     'title',
+    'label',
     'description',
     'placeholder',
     'validationMessage',

rero_ils/modules/acq_accounts/jsonschemas/acq_accounts/acq_account-v0.0.1.json

@@ -4,6 +4,11 @@
   "title": "Acquisition account",
   "description": "JSON schema for an acquisition account",
   "additionalProperties": false,
+  "propertiesOrder": [
+    "name",
+    "description",
+    "amount_allocated"
+  ],
   "required": [
     "$schema",
     "pid",
@@ -26,20 +31,23 @@
     },
     "name": {
       "title": "Name",
-      "description": "Name of the Acquisition account.",
+      "description": "Name of the acquisition account.",
       "type": "string",
-      "minLength": 1
+      "minLength": 1,
+      "form": {
+        "focus": true
+      }
     },
     "description": {
       "title": "Description",
-      "description": "Description of the Acquisition account.",
+      "description": "Description of the acquisition account.",
       "type": "string",
       "minLength": 1
     },
     "budget": {
       "title": "Budget",
       "type": "object",
-      "description": "The Acquisition account belongs to which budget.",
+      "description": "The acquisition account belongs to which budget.",
       "properties": {
         "$ref": {
           "title": "Budget URI",
@@ -50,7 +58,7 @@
     },
     "amount_allocated": {
       "title": "Amount allocated",
-      "description": "The amount allocated for the Acquisition account.",
+      "description": "The amount allocated for the acquisition account.",
       "type": "number"
     },
     "library": {

rero_ils/modules/budgets/api.py

@@ -24,8 +24,8 @@
 from ..api import IlsRecord, IlsRecordsSearch
 from ..fetchers import id_fetcher
 from ..minters import id_minter
-from ..providers import Provider
 from ..organisations.api import Organisation
+from ..providers import Provider
 
 # provider
 BudgetProvider = type(

rero_ils/modules/budgets/jsonschemas/budgets/budget-v0.0.1.json

@@ -4,9 +4,18 @@
   "title": "Budget",
   "description": "JSON schema for budget.",
   "additionalProperties": false,
+  "propertiesOrder": [
+    "name",
+    "start_date",
+    "end_date",
+    "is_active"
+  ],
   "required": [
     "$schema",
-    "pid"
+    "pid",
+    "name",
+    "start_date",
+    "end_date"
   ],
   "properties": {
     "$schema": {
@@ -24,26 +33,60 @@
       "title": "Budget name",
       "description": "Name of the budget.",
       "type": "string",
-      "minLength": 1
+      "minLength": 1,
+      "form": {
+        "focus": true,
+        "validation": {
+          "validators": {
+            "valueAlreadyExists": {
+              "term": "name"
+            }
+          },
+          "messages": {
+            "alreadyTakenMessage": "The budget name is already taken"
+          }
+        }
+      }
     },
     "start_date": {
       "type": "string",
       "format": "date",
+      "title": "Start date",
       "pattern": "\\d{4}-((0[1-9])|(1[0-2]))-(((0[1-9])|[1-2][0-9])|(3[0-1]))$",
-      "validationMessage": "Required. Should be in the ISO 8601, YYYY-MM-DD.",
-      "title": "Budget start date"
+      "validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
+      "form": {
+        "type": "datepicker",
+        "wrappers": [
+          "form-field"
+        ],
+        "validation": {
+          "messages": {
+            "pattern": "Should be in the ISO 8601, YYYY-MM-DD."
+          }
+        }
+      }
     },
     "end_date": {
       "type": "string",
       "format": "date",
+      "title": "End date",
       "pattern": "\\d{4}-((0[1-9])|(1[0-2]))-(((0[1-9])|[1-2][0-9])|(3[0-1]))$",
-      "validationMessage": "Required. Should be in the ISO 8601, YYYY-MM-DD.",
-      "title": "Budget end date"
+      "validationMessage": "Should be in the following format: 2022-12-31 (YYYY-MM-DD).",
+      "form": {
+        "type": "datepicker",
+        "wrappers": [
+          "form-field"
+        ],
+        "validation": {
+          "messages": {
+            "pattern": "Should be in the ISO 8601, YYYY-MM-DD."
+          }
+        }
+      }
     },
     "is_active": {
       "type": "boolean",
-      "title": "True if budget is active",
-      "description": "True if budget is active",
+      "title": "Active",
       "default": false
     },
     "organisation": {