Merge pull request #27 from neilLasrado/develop

Multiple Fixes

pranali_reloaded/desk.py

@@ -86,6 +86,5 @@ def set_desktop_icons():
 	hook_icons = frappe.get_hooks("icons")
 	for icon in hook_icons:
 		 desktop.get(icon.get('module')).append(icon)
-
-	print(desktop)
+
 	return desktop

pranali_reloaded/hook_events/user.py

@@ -2,7 +2,7 @@
 
 def set_user_permissions_for_dcm(doc, method):
     for r in doc.roles:
-        if r.role =="DCM":
+        if r.role =="District Council Member":
             if not frappe.get_all("User Permission",filters={"user":doc.name}):
                 perm = frappe.new_doc("User Permission")
                 perm.user = doc.name

pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.json

@@ -14,7 +14,7 @@
   "section_break_4",
   "time_stamp",
   "column_break_8",
-  "total_attendence",
+  "total_attendance",
   "section_break_8",
   "club",
   "column_break_12",
@@ -73,12 +73,6 @@
    "fieldname": "column_break_8",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "total_attendence",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Total Attendence"
-  },
   {
    "fieldname": "section_break_8",
    "fieldtype": "Section Break"
@@ -118,11 +112,17 @@
    "options": "Ambassadorial Report",
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "total_attendance",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Total Attendance"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-06-13 01:02:30.065535",
+ "modified": "2020-06-28 21:31:24.124249",
  "modified_by": "Administrator",
  "module": "Pranali Reloaded",
  "name": "Ambassadorial Report",

pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.py

@@ -19,7 +19,7 @@ def validate(self):
 	def on_submit(self):
 		self.time_stamp = now()
 		frappe.db.set_value('Ambassadorial Report', self.name, 'document_status', 'submitted')
-	
+
 	def on_cancel(self):
 		frappe.db.set_value('Ambassadorial Report', self.name, 'document_status', 'cancelled')
 
@@ -32,9 +32,9 @@ def check_duplicates(self):
 			if not d.member_id in members:
 				members.append(d.member_id)
 			else:
-				frappe.throw("Attendence for {0} appears multiple times.".format(d.member_name))
-	
+				frappe.throw("Attendance for {0} appears multiple times.".format(d.member_name))
+
 	def count_total(self):
-		self.total_attendence = 0
+		self.total_attendance = 0
 		for d in self.members:
-			self.total_attendence +=1
+			self.total_attendance +=1

pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Avenue', {
+	// refresh: function(frm) {
+
+	// }
+});

pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.json

@@ -0,0 +1,70 @@
+{
+ "actions": [],
+ "autoname": "field:avenue",
+ "creation": "2020-06-28 21:38:51.355130",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "avenue"
+ ],
+ "fields": [
+  {
+   "fieldname": "avenue",
+   "fieldtype": "Data",
+   "label": "Avenue",
+   "unique": 1
+  }
+ ],
+ "links": [],
+ "modified": "2020-06-28 21:38:51.355130",
+ "modified_by": "Administrator",
+ "module": "Pranali Reloaded",
+ "name": "Avenue",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "read": 1,
+   "role": "Club Member - Full Access"
+  },
+  {
+   "read": 1,
+   "role": "District Council Member"
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Club Member - Limited Access",
+   "share": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}

pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class Avenue(Document):
+	pass

pranali_reloaded/pranali_reloaded/doctype/avenue/test_avenue.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Rtr.Neil Trini Lasrado and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestAvenue(unittest.TestCase):
+	pass

pranali_reloaded/pranali_reloaded/doctype/club/club.json

@@ -28,9 +28,14 @@
   "column_break_13",
   "website",
   "blog",
+  "instagram_handle",
   "column_break_8",
   "facebook_page_address",
-  "twitter_handle"
+  "twitter_handle",
+  "section_break_24",
+  "buddy_council_member",
+  "column_break_26",
+  "buddy_council_name"
  ],
  "fields": [
   {
@@ -158,10 +163,35 @@
    "fieldname": "twitter_handle",
    "fieldtype": "Data",
    "label": "Twitter Handle"
+  },
+  {
+   "fieldname": "instagram_handle",
+   "fieldtype": "Data",
+   "label": "Instagram Handle"
+  },
+  {
+   "fieldname": "section_break_24",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "buddy_council_member",
+   "fieldtype": "Link",
+   "label": "Buddy Council Member",
+   "options": "User"
+  },
+  {
+   "fieldname": "column_break_26",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "buddy_council_member.full_name",
+   "fieldname": "buddy_council_name",
+   "fieldtype": "Data",
+   "label": "Buddy Council Name"
   }
  ],
  "links": [],
- "modified": "2020-06-13 01:01:29.650731",
+ "modified": "2020-06-28 21:30:01.057277",
  "modified_by": "Administrator",
  "module": "Pranali Reloaded",
  "name": "Club",

pranali_reloaded/pranali_reloaded/doctype/designation/designation.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Designation', {
+	// refresh: function(frm) {
+
+	// }
+});

pranali_reloaded/pranali_reloaded/doctype/designation/designation.json

@@ -0,0 +1,70 @@
+{
+ "actions": [],
+ "autoname": "field:designation",
+ "creation": "2020-06-28 21:18:40.566598",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "designation"
+ ],
+ "fields": [
+  {
+   "fieldname": "designation",
+   "fieldtype": "Data",
+   "label": "Designation",
+   "unique": 1
+  }
+ ],
+ "links": [],
+ "modified": "2020-06-28 21:18:40.566598",
+ "modified_by": "Administrator",
+ "module": "Pranali Reloaded",
+ "name": "Designation",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "read": 1,
+   "role": "Club Member - Full Access"
+  },
+  {
+   "read": 1,
+   "role": "District Council Member"
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Club Member - Limited Access",
+   "share": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}

pranali_reloaded/pranali_reloaded/doctype/designation/designation.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class Designation(Document):
+	pass

pranali_reloaded/pranali_reloaded/doctype/designation/test_designation.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Rtr.Neil Trini Lasrado and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestDesignation(unittest.TestCase):
+	pass

pranali_reloaded/pranali_reloaded/doctype/meeting/meeting.json

@@ -14,7 +14,7 @@
   "reporting_month",
   "section_break_5",
   "minutes",
-  "section_break_2",
+  "attendance_section",
   "home_club",
   "district_council_members",
   "rotarians",
@@ -90,11 +90,6 @@
    "label": "Minutes",
    "reqd": 1
   },
-  {
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break",
-   "label": "Attendence"
-  },
   {
    "fieldname": "home_club",
    "fieldtype": "Int",
@@ -187,11 +182,16 @@
    "fieldname": "district_council_members",
    "fieldtype": "Int",
    "label": "District Council Members"
+  },
+  {
+   "fieldname": "attendance_section",
+   "fieldtype": "Section Break",
+   "label": "Attendance"
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-06-13 00:57:49.310522",
+ "modified": "2020-06-28 21:37:09.182626",
  "modified_by": "Administrator",
  "module": "Pranali Reloaded",
  "name": "Meeting",