Merge pull request #124 from harshtandiya/hotfix

fix: location cascading in doctypes #118
frappe · Sep 6, 2023 · f4869b5 · f4869b5
2 parents 9acb63a + fad2e8e
commit f4869b5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 48 deletions.
diff --git a/changemakers/frappe_changemakers/doctype/beneficiary/beneficiary.json b/changemakers/frappe_changemakers/doctype/beneficiary/beneficiary.json
@@ -21,12 +21,10 @@
   "social_category",
   "location_section",
   "state",
-  "ward",
-  "column_break_8",
   "district",
-  "habitation",
-  "column_break_9",
   "zone",
+  "ward",
+  "habitation",
   "identity_section",
   "is_identity_proof_available",
   "column_break_17",
@@ -150,19 +148,11 @@
    "fieldtype": "Section Break",
    "label": "Location"
   },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "health_section",
    "fieldtype": "Section Break",
    "label": "Health"
   },
-  {
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "identity_section",
    "fieldtype": "Section Break",
@@ -400,7 +390,7 @@
    "link_fieldname": "beneficiary"
   }
  ],
- "modified": "2023-09-05 17:03:01.300560",
+ "modified": "2023-09-06 19:31:11.618589",
  "modified_by": "Administrator",
  "module": "Frappe Changemakers",
  "name": "Beneficiary",

diff --git a/changemakers/frappe_changemakers/doctype/case/case.json b/changemakers/frappe_changemakers/doctype/case/case.json
@@ -18,14 +18,12 @@
   "amended_from",
   "location_section",
   "is_beneficiary_in_shelter_home",
-  "section_break_ajqf",
+  "section_break_grcq",
   "state",
-  "ward",
-  "column_break_eyby",
   "district",
-  "habitation",
-  "column_break_ouiz",
   "zone",
+  "ward",
+  "habitation",
   "shelter_home",
   "beneficiary_details_section",
   "is_beneficiary_traced",
@@ -199,10 +197,6 @@
    "fieldtype": "Section Break",
    "label": "Location"
   },
-  {
-   "fieldname": "column_break_eyby",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "section_break_zguo",
    "fieldtype": "Section Break",
@@ -305,14 +299,6 @@
    "fieldname": "column_break_qfjk",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "column_break_ouiz",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_ajqf",
-   "fieldtype": "Section Break"
-  },
   {
    "fieldname": "data_cjaa",
    "fieldtype": "Data"
@@ -326,11 +312,15 @@
    "fieldtype": "Data",
    "label": "Created By",
    "read_only": 1
+  },
+  {
+   "fieldname": "section_break_grcq",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-09-06 00:58:01.453261",
+ "modified": "2023-09-06 14:05:10.045885",
  "modified_by": "Administrator",
  "module": "Frappe Changemakers",
  "name": "Case",

diff --git a/changemakers/frappe_changemakers/doctype/health_camp_record/health_camp_record.json b/changemakers/frappe_changemakers/doctype/health_camp_record/health_camp_record.json
@@ -28,19 +28,20 @@
   "specified_camp_location",
   "section_break_xgxk",
   "state",
-  "zone",
-  "habitation",
-  "column_break_oahi",
   "district",
+  "zone",
   "ward",
+  "habitation",
   "medical_details_section",
   "total_medicines_dispensed",
   "total_referrals_done",
   "column_break_wwkx",
   "total_diagnostics_done",
   "section_break_syqt",
   "bottom_save_button",
-  "column_break_aqvh"
+  "column_break_aqvh",
+  "section_break_7w59",
+  "mcrc_details"
  ],
  "fields": [
   {
@@ -135,10 +136,6 @@
    "options": "Habitation",
    "reqd": 1
   },
-  {
-   "fieldname": "column_break_oahi",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "district",
    "fieldtype": "Link",
@@ -216,11 +213,21 @@
   {
    "fieldname": "section_break_aswu",
    "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_7w59",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "mcrc_details",
+   "fieldtype": "Table",
+   "label": "MCRC Details",
+   "options": "MCRC Daily Update"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-06-27 12:38:00.382742",
+ "modified": "2023-09-06 19:30:03.009355",
  "modified_by": "Administrator",
  "module": "Frappe Changemakers",
  "name": "Health Camp Record",

diff --git a/changemakers/frappe_changemakers/doctype/rescue/rescue.json b/changemakers/frappe_changemakers/doctype/rescue/rescue.json
@@ -26,11 +26,10 @@
   "coordinates",
   "section_break_sslw",
   "state",
-  "zone",
-  "habitation",
-  "column_break_itmb",
   "district",
+  "zone",
   "ward",
+  "habitation",
   "post_rescue_details_section",
   "was_referred_to_hospital",
   "hospital",
@@ -249,10 +248,6 @@
    "label": "Hotspot Name/Habitation",
    "options": "Habitation"
   },
-  {
-   "fieldname": "column_break_itmb",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "state",
    "fieldtype": "Link",
@@ -290,7 +285,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-05 17:08:57.368937",
+ "modified": "2023-09-06 19:28:44.208583",
  "modified_by": "Administrator",
  "module": "Frappe Changemakers",
  "name": "Rescue",