feat: update LANDA Member and Member Data Import (LAN-791) (#251)

alyf-de · Nov 21, 2023 · 0448921 · 0448921
1 parent 16d35d9
commit 0448921
Show file tree

Hide file tree

Showing 5 changed files with 273 additions and 60 deletions.
diff --git a/landa/fixtures/translation.json b/landa/fixtures/translation.json
@@ -4511,22 +4511,6 @@
   "source_text": "Pincode",
   "translated_text": "Postleitzahl"
  },
- {
-  "context": null,
-  "contributed": 0,
-  "contribution_docname": null,
-  "contribution_status": "",
-  "docstatus": 0,
-  "doctype": "Translation",
-  "language": "de",
-  "modified": "2023-09-26 15:40:26.449471",
-  "name": "2418380635",
-  "parent": null,
-  "parentfield": null,
-  "parenttype": null,
-  "source_text": "Full Address",
-  "translated_text": "Vollst\u00e4ndige Adresse"
- },
  {
   "context": null,
   "contributed": 0,
@@ -5807,6 +5791,22 @@
   "source_text": "Pincode",
   "translated_text": "Postleitzahl"
  },
+ {
+  "context": null,
+  "contributed": 0,
+  "contribution_docname": null,
+  "contribution_status": "",
+  "docstatus": 0,
+  "doctype": "Translation",
+  "language": "de",
+  "modified": "2021-09-02 17:10:49.800353",
+  "name": "6dc383a8a1",
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "source_text": "Primary Address (Full)",
+  "translated_text": "Prim\u00e4re Adresse (kommagetrennt)"
+ },
  {
   "context": null,
   "contributed": 0,
@@ -7630,5 +7630,69 @@
   "parenttype": null,
   "source_text": "Email (Shipping Contact)",
   "translated_text": "E-Mail (Versandkontakt)"
+ },
+ {
+  "context": null,
+  "contributed": 0,
+  "contribution_docname": null,
+  "contribution_status": "",
+  "docstatus": 0,
+  "doctype": "Translation",
+  "language": "de",
+  "modified": "2023-09-26 15:40:26.449471",
+  "name": "2418380635",
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "source_text": "Full Address",
+  "translated_text": "Vollst\u00e4ndige Adresse"
+ },
+ {
+  "context": null,
+  "contributed": 0,
+  "contribution_docname": null,
+  "contribution_status": "",
+  "docstatus": 0,
+  "doctype": "Translation",
+  "language": "de",
+  "modified": "2023-11-17 10:42:22.601426",
+  "name": "a09ddbebc1",
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "source_text": "Permit Issue Date",
+  "translated_text": "Ausgabedatum Erlaubnisschein"
+ },
+ {
+  "context": null,
+  "contributed": 0,
+  "contribution_docname": null,
+  "contribution_status": "",
+  "docstatus": 0,
+  "doctype": "Translation",
+  "language": "de",
+  "modified": "2023-11-17 10:43:00.798179",
+  "name": "bc5faa1ad9",
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "source_text": "Issuing Authority",
+  "translated_text": "Ausstellende Beh\u00f6rde"
+ },
+ {
+  "context": null,
+  "contributed": 0,
+  "contribution_docname": null,
+  "contribution_status": "",
+  "docstatus": 0,
+  "doctype": "Translation",
+  "language": "de",
+  "modified": "2023-11-17 10:45:24.155799",
+  "name": "945cbae46f",
+  "parent": null,
+  "parentfield": null,
+  "parenttype": null,
+  "source_text": "Special Yearly Fishing Permits",
+  "translated_text": "Spezielle Erlaubnisscheine"
  }
-]
+]
diff --git a/landa/organization_management/doctype/landa_member/landa_member.json b/landa/organization_management/doctype/landa_member/landa_member.json
@@ -22,18 +22,28 @@
   "is_supporting_member",
   "magazine_recipient",
   "has_key",
-  "has_special_yearly_fishing_permit_1",
-  "has_special_yearly_fishing_permit_2",
   "youth_membership",
   "additional_information",
+  "special_yearly_fishing_permits_section",
+  "has_special_yearly_fishing_permit_1",
+  "has_special_yearly_fishing_permit_2",
+  "has_special_yearly_fishing_permit_3",
+  "has_special_yearly_fishing_permit_4",
+  "column_break_qhrfl",
+  "has_special_yearly_fishing_permit_5",
+  "has_special_yearly_fishing_permit_6",
+  "has_special_yearly_fishing_permit_7",
   "section_address_and_contact",
   "address_html",
   "column_break_5",
   "contact_html",
   "section_break_9",
   "has_fishing_permit",
   "fishing_permit_number",
+  "issuing_authority",
+  "column_break_hsdce",
   "permit_is_valid_for_life",
+  "permit_issue_date",
   "permit_expiration_date"
  ],
  "fields": [
@@ -194,18 +204,6 @@
    "fieldtype": "Data",
    "label": "Additional Information"
   },
-  {
-   "default": "0",
-   "fieldname": "has_special_yearly_fishing_permit_1",
-   "fieldtype": "Check",
-   "label": "Hat Sachsen-Anhalt Erlaubnisschein"
-  },
-  {
-   "default": "0",
-   "fieldname": "has_special_yearly_fishing_permit_2",
-   "fieldtype": "Check",
-   "label": "Hat Brandenburg Erlaubnisschein"
-  },
   {
    "allow_in_quick_entry": 1,
    "depends_on": "eval:doc.has_fishing_permit==1",
@@ -226,6 +224,75 @@
    "fieldtype": "Check",
    "in_standard_filter": 1,
    "label": "Youth Membership"
+  },
+  {
+   "allow_in_quick_entry": 1,
+   "depends_on": "eval:doc.has_fishing_permit==1",
+   "fieldname": "issuing_authority",
+   "fieldtype": "Data",
+   "label": "Issuing Authority"
+  },
+  {
+   "depends_on": "eval:doc.has_fishing_permit==1",
+   "fieldname": "permit_issue_date",
+   "fieldtype": "Date",
+   "label": "Permit Issue Date"
+  },
+  {
+   "fieldname": "column_break_hsdce",
+   "fieldtype": "Column Break"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "special_yearly_fishing_permits_section",
+   "fieldtype": "Section Break",
+   "label": "Special Yearly Fishing Permits"
+  },
+  {
+   "fieldname": "column_break_qhrfl",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_1",
+   "fieldtype": "Check",
+   "label": "Hat Sachsen-Anhalt Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_2",
+   "fieldtype": "Check",
+   "label": "Hat Brandenburg Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_3",
+   "fieldtype": "Check",
+   "label": "Hat Berlin Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_4",
+   "fieldtype": "Check",
+   "label": "Hat Mecklenburg-Vorpommern Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_5",
+   "fieldtype": "Check",
+   "label": "Hat Saalekaskade Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_6",
+   "fieldtype": "Check",
+   "label": "Hat LAVT Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_7",
+   "fieldtype": "Check",
+   "label": "Hat VANT Erlaubnisschein"
   }
  ],
  "links": [
@@ -246,7 +313,7 @@
    "link_fieldname": "landa_member"
   }
  ],
- "modified": "2023-11-10 12:21:56.664104",
+ "modified": "2023-11-16 20:01:31.394908",
  "modified_by": "Administrator",
  "module": "Organization Management",
  "name": "LANDA Member",

diff --git a/landa/organization_management/doctype/member_data_import/member_data_import.json b/landa/organization_management/doctype/member_data_import/member_data_import.json
@@ -18,9 +18,16 @@
   "column_break_7",
   "has_key",
   "is_supporting_member",
-  "has_special_yearly_fishing_permit_2",
-  "has_special_yearly_fishing_permit_1",
   "youth_membership",
+  "special_yearly_fishing_permits_section",
+  "has_special_yearly_fishing_permit_1",
+  "has_special_yearly_fishing_permit_2",
+  "has_special_yearly_fishing_permit_3",
+  "has_special_yearly_fishing_permit_4",
+  "column_break_m5jmg",
+  "has_special_yearly_fishing_permit_5",
+  "has_special_yearly_fishing_permit_6",
+  "has_special_yearly_fishing_permit_7",
   "section_break_9",
   "address_name",
   "address_line1",
@@ -175,11 +182,50 @@
    "fieldname": "youth_membership",
    "fieldtype": "Check",
    "label": "Youth Membership"
+  },
+  {
+   "fieldname": "special_yearly_fishing_permits_section",
+   "fieldtype": "Section Break",
+   "label": "Special Yearly Fishing Permits"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_3",
+   "fieldtype": "Check",
+   "label": "Hat Berlin Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_4",
+   "fieldtype": "Check",
+   "label": "Hat Mecklenburg-Vorpommern Erlaubnisschein"
+  },
+  {
+   "fieldname": "column_break_m5jmg",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_5",
+   "fieldtype": "Check",
+   "label": "Hat Saalekaskade Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_6",
+   "fieldtype": "Check",
+   "label": "Hat LAVT Erlaubnisschein"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_special_yearly_fishing_permit_7",
+   "fieldtype": "Check",
+   "label": "Hat VANT Erlaubnisschein"
   }
  ],
  "is_virtual": 1,
  "links": [],
- "modified": "2022-11-23 12:26:08.705403",
+ "modified": "2023-11-17 10:26:17.637563",
  "modified_by": "Administrator",
  "module": "Organization Management",
  "name": "Member Data Import",

diff --git a/landa/organization_management/doctype/member_data_import/member_data_import.py b/landa/organization_management/doctype/member_data_import/member_data_import.py
@@ -20,6 +20,11 @@ class MemberDataImport(Document):
 		"has_key",
 		"has_special_yearly_fishing_permit_1",
 		"has_special_yearly_fishing_permit_2",
+		"has_special_yearly_fishing_permit_3",
+		"has_special_yearly_fishing_permit_4",
+		"has_special_yearly_fishing_permit_5",
+		"has_special_yearly_fishing_permit_6",
+		"has_special_yearly_fishing_permit_7",
 		"youth_membership",
 		"additional_information",
 	]