Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool

This commit is contained in:
Neil Trini Lasrado 2016-11-21 17:04:23 +05:30
parent 6566431fc5
commit b444d5d81b
16 changed files with 31 additions and 41 deletions

View File

@ -51,7 +51,7 @@ def get_data():
}, },
{ {
"type": "doctype", "type": "doctype",
"name": "Batch Creation Tool" "name": "Student Batch Creation Tool"
} }
] ]
}, },
@ -69,7 +69,7 @@ def get_data():
}, },
{ {
"type": "doctype", "type": "doctype",
"name": "Scheduling Tool" "name": "Course Scheduling Tool"
}, },
{ {
"type": "doctype", "type": "doctype",
@ -147,7 +147,11 @@ def get_data():
}, },
{ {
"type": "doctype", "type": "doctype",
"name": "Student Batch Name" "name": "Instructor"
},
{
"type": "doctype",
"name": "Room"
}, },
{ {
"type": "doctype", "type": "doctype",
@ -155,15 +159,7 @@ def get_data():
}, },
{ {
"type": "doctype", "type": "doctype",
"name": "Grading Structure" "name": "Student Batch Name"
},
{
"type": "doctype",
"name": "Instructor"
},
{
"type": "doctype",
"name": "Room"
}, },
{ {
"type": "doctype", "type": "doctype",

View File

@ -1,10 +1,13 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
cur_frm.add_fetch("student_group", "program", "program"); cur_frm.add_fetch("student_group", "program", "program");
cur_frm.add_fetch("student_group", "student_batch", "student_batch"); cur_frm.add_fetch("student_group", "student_batch", "student_batch");
cur_frm.add_fetch("student_group", "course", "course"); cur_frm.add_fetch("student_group", "course", "course");
cur_frm.add_fetch("student_group", "academic_year", "academic_year"); cur_frm.add_fetch("student_group", "academic_year", "academic_year");
cur_frm.add_fetch("student_group", "academic_term", "academic_term"); cur_frm.add_fetch("student_group", "academic_term", "academic_term");
frappe.ui.form.on("Scheduling Tool", "refresh", function(frm) { frappe.ui.form.on("Course Scheduling Tool", "refresh", function(frm) {
frm.disable_save(); frm.disable_save();
frm.page.set_primary_action(__("Schedule Course"), function() { frm.page.set_primary_action(__("Schedule Course"), function() {
frappe.call({ frappe.call({

View File

@ -592,10 +592,10 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2016-11-18 17:48:40.610284", "modified": "2016-11-21 16:58:29.295922",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Scheduling Tool", "name": "Course Scheduling Tool",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
@ -10,7 +10,7 @@ from frappe.model.document import Document
from frappe.utils import add_days, getdate from frappe.utils import add_days, getdate
from erpnext.schools.utils import OverlapError from erpnext.schools.utils import OverlapError
class SchedulingTool(Document): class CourseSchedulingTool(Document):
def schedule_course(self): def schedule_course(self):
"""Creates course schedules as per specified parametes""" """Creates course schedules as per specified parametes"""
@ -102,3 +102,4 @@ class SchedulingTool(Document):
course_schedule.from_time= self.from_time course_schedule.from_time= self.from_time
course_schedule.to_time= self.to_time course_schedule.to_time= self.to_time
return course_schedule return course_schedule

View File

@ -1,12 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe and Contributors
# See license.txt
from __future__ import unicode_literals
import frappe
import unittest
# test_records = frappe.get_test_records('Scheduling Tool')
class TestSchedulingTool(unittest.TestCase):
pass

View File

@ -18,7 +18,7 @@
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "student_batch_name", "fieldname": "student_batch_name",
"fieldtype": "Data", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
@ -28,6 +28,7 @@
"label": "Student Batch Name", "label": "Student Batch Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Student Batch Name",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -221,7 +222,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-07 05:59:36.920495", "modified": "2016-11-21 16:52:23.939904",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Student Batch", "name": "Student Batch",

View File

@ -1,7 +1,7 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Batch Creation Tool', { frappe.ui.form.on('Student Batch Creation Tool', {
refresh: function(frm) { refresh: function(frm) {
frm.disable_save(); frm.disable_save();
} }

View File

@ -138,10 +138,10 @@
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-18 17:33:03.157470", "modified": "2016-11-21 16:47:56.823988",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Batch Creation Tool", "name": "Student Batch Creation Tool",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [

View File

@ -6,7 +6,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
class BatchCreationTool(Document): class StudentBatchCreationTool(Document):
def make_batch(self): def make_batch(self):
if self.academic_year and self.program and self.student_batch_name: if self.academic_year and self.program and self.student_batch_name:
students = frappe.get_list("Program Enrollment", fields=["student", "student_name"], students = frappe.get_list("Program Enrollment", fields=["student", "student_name"],
@ -24,3 +24,4 @@ class BatchCreationTool(Document):
frappe.msgprint("Student Batch created.") frappe.msgprint("Student Batch created.")
else: else:
frappe.msgprint("No students found.") frappe.msgprint("No students found.")

View File

@ -1,7 +1,7 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Batch Name', { frappe.ui.form.on('Student Batch Name', {
refresh: function(frm) { refresh: function(frm) {
} }

View File

@ -51,10 +51,10 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-17 18:46:01.359799", "modified": "2016-11-21 16:31:50.775958",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Batch Name", "name": "Student Batch Name",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [

View File

@ -6,5 +6,5 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
class BatchName(Document): class StudentBatchName(Document):
pass pass

View File

@ -6,7 +6,7 @@ from __future__ import unicode_literals
import frappe import frappe
import unittest import unittest
# test_records = frappe.get_test_records('Batch Name') # test_records = frappe.get_test_records('Student Batch Name')
class TestBatchName(unittest.TestCase): class TestStudentBatchName(unittest.TestCase):
pass pass