From 8b6960d46cb04feda9a07e3bc0a0cbbe893ada98 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 22 Apr 2016 12:56:29 +0530 Subject: [PATCH 1/7] Improved make demo --- schools/make_demo.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/schools/make_demo.py b/schools/make_demo.py index 3bd5e8b..b25a26d 100644 --- a/schools/make_demo.py +++ b/schools/make_demo.py @@ -62,6 +62,7 @@ def make_student_applicants(): file_path = get_json_path("Random Student Data") with open(file_path, "r") as open_file: random_student_data = json.loads(open_file.read()) + count = 1 for d in random_student_data: student_applicant = frappe.new_doc("Student Applicant") student_applicant.first_name = d.get('first_name').title() @@ -69,7 +70,11 @@ def make_student_applicants(): student_applicant.image = d.get('image') student_applicant.gender = d.get('gender') student_applicant.program = get_random("Program") - student_applicant.submit() + if count <5: + student_applicant.save() + else: + student_applicant.submit() + count+1 def make_student_group(): for d in frappe.db.get_list("Academic Term"): From 47454dc6f388304445c709d815e8dfc8999d447f Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 22 Apr 2016 15:53:09 +0530 Subject: [PATCH 2/7] Improved random student data generation in demo --- schools/make_demo.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/schools/make_demo.py b/schools/make_demo.py index b25a26d..7d89612 100644 --- a/schools/make_demo.py +++ b/schools/make_demo.py @@ -5,7 +5,8 @@ from frappe.core.page.data_import_tool.data_import_tool import import_doc from schools.simulate import simulate from frappe.utils.make_random import get_random -import time +from datetime import datetime +import time, random def make(): frappe.flags.mute_emails = True @@ -59,10 +60,22 @@ def make_masters(): import_data("Program") def make_student_applicants(): + blood_group = ["A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"] + male_names = [] + female_names = [] + file_path = get_json_path("Random Student Data") with open(file_path, "r") as open_file: random_student_data = json.loads(open_file.read()) count = 1 + + for d in random_student_data: + if d.get('gender') == "Male": + male_names.append(d.get('first_name').title()) + + if d.get('gender') == "Female": + female_names.append(d.get('first_name').title()) + for d in random_student_data: student_applicant = frappe.new_doc("Student Applicant") student_applicant.first_name = d.get('first_name').title() @@ -70,11 +83,18 @@ def make_student_applicants(): student_applicant.image = d.get('image') student_applicant.gender = d.get('gender') student_applicant.program = get_random("Program") + student_applicant.blood_group = random.choice(blood_group) + year = random.randint(1990, 1998) + month = random.randint(1, 12) + day = random.randint(1, 28) + student_applicant.date_of_birth = datetime(year, month, day) + student_applicant.mother_name = random.choice(female_names) + " " + d.get('last_name').title() + student_applicant.father_name = random.choice(male_names) + " " + d.get('last_name').title() if count <5: student_applicant.save() else: student_applicant.submit() - count+1 + count+=1 def make_student_group(): for d in frappe.db.get_list("Academic Term"): From 75cb6480aca4890b7ecab7a7f7458295fe3c0f9d Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 22 Apr 2016 19:15:04 +0530 Subject: [PATCH 3/7] Course schedule calender view cleanup --- .../doctype/course_schedule/course_schedule_calendar.js | 2 +- schools/api.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/schools/academics/doctype/course_schedule/course_schedule_calendar.js b/schools/academics/doctype/course_schedule/course_schedule_calendar.js index e2c574c..11b04d1 100644 --- a/schools/academics/doctype/course_schedule/course_schedule_calendar.js +++ b/schools/academics/doctype/course_schedule/course_schedule_calendar.js @@ -4,7 +4,7 @@ frappe.views.calendar["Course Schedule"] = { "start": "from_datetime", "end": "to_datetime", "id": "name", - "title": "title", + "title": "course", "allDay": "allDay" }, gantt: false, diff --git a/schools/api.py b/schools/api.py index 63f2837..146cd39 100644 --- a/schools/api.py +++ b/schools/api.py @@ -111,7 +111,7 @@ def get_course_schedule_events(start, end, filters=None): from frappe.desk.calendar import get_event_conditions conditions = get_event_conditions("Course Schedule", filters) - data = frappe.db.sql("""select name, title, + data = frappe.db.sql("""select name, course, timestamp(schedule_date, from_time) as from_datetime, timestamp(schedule_date, to_time) as to_datetime, room, student_group, 0 as 'allDay' @@ -122,8 +122,4 @@ def get_course_schedule_events(start, end, filters=None): "end": end }, as_dict=True, update={"allDay": 0}) - - for d in data: - d.title += " \n for " + d.student_group + " in Room "+ d.room - return data \ No newline at end of file From 3b642371431779f3812e897aa00c4a17aa6c89ad Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 15 Apr 2016 13:53:10 +0530 Subject: [PATCH 4/7] change links in schools --- schools/public/js/conf.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 schools/public/js/conf.js diff --git a/schools/public/js/conf.js b/schools/public/js/conf.js new file mode 100644 index 0000000..2247309 --- /dev/null +++ b/schools/public/js/conf.js @@ -0,0 +1,18 @@ +// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +// License: GNU General Public License v3. See license.txt + +frappe.provide('schools'); + +// add toolbar icon +$(document).bind('toolbar_setup', function() { + frappe.app.name = "Schools"; + + frappe.help_feedback_link = '

Feedback

' + + + $('.navbar-home').html(''); + + $('[data-link="docs"]').attr("href", "http://frappe.github.io/schools/") +}); From ce3e15e81feb9d9656ab5957f6ac7cbe58de1d25 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 2 May 2016 15:50:30 +0530 Subject: [PATCH 5/7] Fixes in links --- schools/hooks.py | 2 +- schools/public/build.json | 5 +++++ schools/public/js/conf.js | 11 ++--------- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 schools/public/build.json diff --git a/schools/hooks.py b/schools/hooks.py index 4916fc2..eeeb75a 100644 --- a/schools/hooks.py +++ b/schools/hooks.py @@ -22,7 +22,7 @@ # include js, css files in header of desk.html # app_include_css = "/assets/schools/css/schools.css" -# app_include_js = "/assets/schools/js/schools.js" +app_include_js = "/assets/js/schools.min.js" # include js, css files in header of web template # web_include_css = "/assets/schools/css/schools.css" diff --git a/schools/public/build.json b/schools/public/build.json new file mode 100644 index 0000000..f3c452b --- /dev/null +++ b/schools/public/build.json @@ -0,0 +1,5 @@ +{ + "js/schools.min.js": [ + "public/js/conf.js" + ] +} diff --git a/schools/public/js/conf.js b/schools/public/js/conf.js index 2247309..137698a 100644 --- a/schools/public/js/conf.js +++ b/schools/public/js/conf.js @@ -6,13 +6,6 @@ frappe.provide('schools'); // add toolbar icon $(document).bind('toolbar_setup', function() { frappe.app.name = "Schools"; - - frappe.help_feedback_link = '

Feedback

' - - - $('.navbar-home').html(''); - $('[data-link="docs"]').attr("href", "http://frappe.github.io/schools/") -}); + $('[data-link="issues"]').attr("href", "https://github.com/frappe/schools/issues") +}); \ No newline at end of file From 33b464aacda1104bb23e9cd4b396f84095c92ed0 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 18 May 2016 15:19:15 +0530 Subject: [PATCH 6/7] Removed website, crm to be blocked on setup wizard compleation --- schools/setup_wizard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schools/setup_wizard.py b/schools/setup_wizard.py index aa15a15..4eed26f 100644 --- a/schools/setup_wizard.py +++ b/schools/setup_wizard.py @@ -60,7 +60,7 @@ def create_room(args): room.save() def block_modules(): - enabled_modules= ["Stock", "Website", "HR", "Learn"] + enabled_modules= ["Stock", "Website", "HR", "Learn", "CRM", "Accounts", "Projects"] all_erpnext_modules = frappe.get_list("Desktop Icon", fields=["module_name"], filters={'app': 'erpnext'}) for module in all_erpnext_modules: if module.module_name not in enabled_modules: @@ -68,8 +68,9 @@ def block_modules(): def disable_roles(): enabled_roles_list = [ - "Guest", "Administrator", "System Manager", "All", "Academics User", - "HR User", "HR Manager"] + "Guest", "Administrator", "System Manager", "All", "Academics User", "HR User", + "HR Manager", "Website Manager", "Stock User", "Stock Manager", "Newsletter Manager", + "Projects User", "Projects Manager", "Accounts User", "Accounts Manager", "Item Manager"] for role in frappe.get_list("Role"): if not role.name in enabled_roles_list: role_doc = frappe.get_doc("Role", role) From 6c351436ae8abbef4c73d5c97c5df203c2103582 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 May 2016 12:50:44 +0600 Subject: [PATCH 7/7] bumped to version 0.3.0 --- schools/__version__.py | 2 +- schools/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schools/__version__.py b/schools/__version__.py index 3e28815..f71dc80 100644 --- a/schools/__version__.py +++ b/schools/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '0.2.0' +__version__ = '0.3.0' diff --git a/schools/hooks.py b/schools/hooks.py index eeeb75a..5c433ae 100644 --- a/schools/hooks.py +++ b/schools/hooks.py @@ -8,7 +8,7 @@ app_icon = "octicon octicon-mortar-board" app_color = "blue" app_email = "hello@frappe.io" -app_version = "0.2.0" +app_version = "0.3.0" app_license = "GNU General Public License v3" # setup wizard diff --git a/setup.py b/setup.py index d271bf4..2a4d537 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = '0.2.0' +version = '0.3.0' requirements = parse_requirements("requirements.txt", session="") setup(