From b5c512fe8360a8f5aa0e5c0932114aad6669b525 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Sun, 22 Sep 2019 17:43:07 +0530 Subject: [PATCH 01/12] add diploma to se --- SAP/SEADIP.csv | 7 +++++++ SAP/SEBDIP.csv | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 SAP/SEADIP.csv create mode 100644 SAP/SEBDIP.csv diff --git a/SAP/SEADIP.csv b/SAP/SEADIP.csv new file mode 100644 index 0000000..ef6f19a --- /dev/null +++ b/SAP/SEADIP.csv @@ -0,0 +1,7 @@ +64,60004198002,GANDHI BHAVYA JITENDRA KRUPALI +65,60004198003,JAIN VIDHI DINESH VAISHALI +66,60004198004,KAMATH SRIKANT MANISH +67,60004198007,RAGHANI URVI KIRAN +68,60004198008,RAMANI SMEET KIRAN +69,60004198009,ROBEY ALLAN ROBEY KAVITA +70,60004198010,SHAH DHAIRYA VIPUL ARCHANA \ No newline at end of file diff --git a/SAP/SEBDIP.csv b/SAP/SEBDIP.csv new file mode 100644 index 0000000..850f05b --- /dev/null +++ b/SAP/SEBDIP.csv @@ -0,0 +1,6 @@ +65,60004198001,AMOGH DESAI +66,60004198005,PARTH PANCHAL +67,60004198006,SANDEEP PARMAR +68,60004198011,KRUTIK SHAH +69,60004198012,YASHVI SHAH +70,60004198013,SHUBHAM UPADHYAY \ No newline at end of file From 53d548e79582d8ea7d131542f1416cb8b4a4c742 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Mon, 23 Sep 2019 19:37:18 +0530 Subject: [PATCH 02/12] add autonomous to sap sheet --- Attendance/views.py | 4 ++-- SAP/autonomous_header.jpeg | Bin 0 -> 10020 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 SAP/autonomous_header.jpeg diff --git a/Attendance/views.py b/Attendance/views.py index 3e410ac..737ec81 100644 --- a/Attendance/views.py +++ b/Attendance/views.py @@ -776,9 +776,9 @@ def get(self, request, *args, **kwargs): font.size = Pt(11) try: - document.add_picture('/home/wizdem/Attendance-System-Web/SAP/header.png', width=Inches(6)) + document.add_picture('/home/wizdem/Attendance-System-Web/SAP/autonomous_header.jpeg', width=Inches(6)) except FileNotFoundError: - document.add_picture('SAP/header.png', width=Inches(6)) + document.add_picture('SAP/autonomous_header.jpeg', width=Inches(6)) last_paragraph = document.paragraphs[-1] last_paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER diff --git a/SAP/autonomous_header.jpeg b/SAP/autonomous_header.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..f97b8494db11a5af2b607053e5ca084deec38ba7 GIT binary patch literal 10020 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 Date: Wed, 8 Jan 2020 21:47:51 +0530 Subject: [PATCH 03/12] workload 2020 --- SAP/{WorkLoad.csv => 2019WorkloadOdd.csv} | 0 SAP/2020WorkloadEven.csv | 28 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) rename SAP/{WorkLoad.csv => 2019WorkloadOdd.csv} (100%) create mode 100644 SAP/2020WorkloadEven.csv diff --git a/SAP/WorkLoad.csv b/SAP/2019WorkloadOdd.csv similarity index 100% rename from SAP/WorkLoad.csv rename to SAP/2019WorkloadOdd.csv diff --git a/SAP/2020WorkloadEven.csv b/SAP/2020WorkloadEven.csv new file mode 100644 index 0000000..bc2eb42 --- /dev/null +++ b/SAP/2020WorkloadEven.csv @@ -0,0 +1,28 @@ +SE,AOA,A,Pranit Bari/Neepa Shah +,,B,Pranit Bari +,COA,A,Aniket Kore +,,B,Aniket Kore +,CG,A,Khushali Deulkar/Neepa Shah +,,B,Khushali Deulkar/Neepa Shah +,OS,A,Chetashri Bhadane +,,B,Aruna Gawde +,OSTL,A,Deepika Dongre +,,B,Deepika Dongre +,Maths,A,Krupa Shikhare +,,B,Krupa Shikhare +TE,SE,A,Sudhir Bagul +,,B,Sudhir Bagul +,SPCC,A,Lynette D'Mello +,,B,Lynette D'Mello +,DWM,A,Kiran Bhowmick/Sindhu Nair +,,B,Kiran Bhowmick/Apoorva Joshi +,CSS,A,Sonali Jadhav +,,B,Ram Mangrulkar/ Sonali Jadhav +,ML,A,Ruhina karani +,,B,Kriti Srivastava +BE,HMI,A,Ashok Patade/Pratik Kanani +,,B,Ashok Patade/Pratik Kanani +,DC,A,Sindhu Nair/Nilambari Nadkar +,,B,Pakaj Sonawane/Nilambari Nadkar +,NLP,A,Lakshmi Kurup/Ruhina Karani +,,B,Lakshmi Kurup/Ruhina Karani \ No newline at end of file From 7b1772c7ba63bda233cf194c9f3329c36d17899f Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 8 Jan 2020 21:52:05 +0530 Subject: [PATCH 04/12] typo in pankaj sir's name solved --- SAP/2020WorkloadEven.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAP/2020WorkloadEven.csv b/SAP/2020WorkloadEven.csv index bc2eb42..82d6494 100644 --- a/SAP/2020WorkloadEven.csv +++ b/SAP/2020WorkloadEven.csv @@ -23,6 +23,6 @@ TE,SE,A,Sudhir Bagul BE,HMI,A,Ashok Patade/Pratik Kanani ,,B,Ashok Patade/Pratik Kanani ,DC,A,Sindhu Nair/Nilambari Nadkar -,,B,Pakaj Sonawane/Nilambari Nadkar +,,B,Pankaj Sonawane/Nilambari Nadkar ,NLP,A,Lakshmi Kurup/Ruhina Karani ,,B,Lakshmi Kurup/Ruhina Karani \ No newline at end of file From 6079bb302e9595205bcaae3b74237788f5907693 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 8 Jan 2020 22:48:40 +0530 Subject: [PATCH 05/12] promoting options added --- SAP/dump.py | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/SAP/dump.py b/SAP/dump.py index f207111..912ca74 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -13,6 +13,44 @@ current_sem = "odd" +def PromoteDiv(div_name, classteacher=None, old_year=current_year, old_semester=current_sem - 1, with_pracs=False): + yearname, division = div_name.split("_") + + div_exists = Div.objects.filter(semester=old_semester, calendar_year=old_year, division=division).exists() + if not div_exists: + raise Exception("Div not Found") + + if with_pracs: + for div in Div.objects.filter(semester=old_semester, calendar_year=old_year, division_startswith=division): + if classteacher: + names = classteacher.strip().split(' ') + teacher = Teacher.objects.get(user=AppUser.objects.get(first_name=names[0], last_name=names[1])) + new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, + division=div.division, classteacher=teacher) + else: + new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, + division=div.division) + + studivs = StudentDivision.objects.filter(division=div) + for sd in studivs: + StudentDivision.objects.create(student=sd.student, division=new_div) + else: + if classteacher: + names = classteacher.strip().split(' ') + teacher = Teacher.objects.get(user=AppUser.objects.get(first_name=names[0], last_name=names[1])) + new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, + division=division, classteacher=teacher) + else: + new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, + division=division) + print("\033[92m{}\033[00m" .format(div_name + "promoted")) + + +def PromoteAllDivs(old_year=current_year, old_semester=current_sem - 1): + for div in Div.objects.filter(semester=old_semester, calendar_year=old_year): + PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False) + + def SAPDump(path, div_name, overwrite=False, reverse_names=False, classteacher=None): yearname, division = div_name.split("_") year = Div.yearnameToYear(yearname) @@ -22,20 +60,20 @@ def SAPDump(path, div_name, overwrite=False, reverse_names=False, classteacher=N elif date.today().month > 6: semester = year * 2 - 1 - div_exists = Div.objects.filter(semester=semester, calendar_year=date.today().year, division=division).exists() + div_exists = Div.objects.filter(semester=semester, calendar_year=current_year, division=division).exists() if div_exists and not overwrite: raise Exception("Div already exists, set overwrite to True to overwrite") elif div_exists: - div = Div.objects.get(semester=semester, calendar_year=date.today().year, division=division) + div = Div.objects.get(semester=semester, calendar_year=current_year, division=division) else: if classteacher: names = classteacher.strip().split(' ') teacher = Teacher.objects.get(user=AppUser.objects.get(first_name=names[0], last_name=names[1])) - div = Div.objects.create(semester=semester, calendar_year=date.today().year, division=division) + div = Div.objects.create(semester=semester, calendar_year=current_year, division=division) div.classteacher = teacher div.save() else: - div = Div.objects.create(semester=semester, calendar_year=date.today().year, division=division) + div = Div.objects.create(semester=semester, calendar_year=current_year, division=division) with open(path, 'r') as csvFile: reader = csv.reader(csvFile) From 8d1d8a4310fadb7a72babd96558a47a2ff8004c3 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 8 Jan 2020 22:50:50 +0530 Subject: [PATCH 06/12] debug promotion --- SAP/dump.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SAP/dump.py b/SAP/dump.py index 912ca74..4a45506 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -13,7 +13,7 @@ current_sem = "odd" -def PromoteDiv(div_name, classteacher=None, old_year=current_year, old_semester=current_sem - 1, with_pracs=False): +def PromoteDiv(div_name, classteacher=None, old_semester, old_year=current_year, with_pracs=False): yearname, division = div_name.split("_") div_exists = Div.objects.filter(semester=old_semester, calendar_year=old_year, division=division).exists() @@ -46,7 +46,7 @@ def PromoteDiv(div_name, classteacher=None, old_year=current_year, old_semester= print("\033[92m{}\033[00m" .format(div_name + "promoted")) -def PromoteAllDivs(old_year=current_year, old_semester=current_sem - 1): +def PromoteAllDivs(old_semester, old_year=current_year): for div in Div.objects.filter(semester=old_semester, calendar_year=old_year): PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False) From 85f81989b32faace69c28b85f62656677434bf10 Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 8 Jan 2020 22:51:37 +0530 Subject: [PATCH 07/12] debug promotion again --- SAP/dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAP/dump.py b/SAP/dump.py index 4a45506..18bf128 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -13,7 +13,7 @@ current_sem = "odd" -def PromoteDiv(div_name, classteacher=None, old_semester, old_year=current_year, with_pracs=False): +def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, with_pracs=False): yearname, division = div_name.split("_") div_exists = Div.objects.filter(semester=old_semester, calendar_year=old_year, division=division).exists() From 11739fb85c248d3736b2b7ee29fb734785e9311e Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Wed, 8 Jan 2020 22:53:19 +0530 Subject: [PATCH 08/12] final promotion code --- SAP/dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAP/dump.py b/SAP/dump.py index 18bf128..bf55b50 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -43,7 +43,7 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, else: new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, division=division) - print("\033[92m{}\033[00m" .format(div_name + "promoted")) + print("\033[92m{}\033[00m" .format(div_name + " promoted")) def PromoteAllDivs(old_semester, old_year=current_year): From 7829c1fefb751f5da5c9bd96d23fd712b33d7f3e Mon Sep 17 00:00:00 2001 From: Ankit Rishi Gupta <36430212+WizDemirider@users.noreply.github.com> Date: Thu, 9 Jan 2020 12:57:53 +0530 Subject: [PATCH 09/12] fix promotions --- SAP/dump.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SAP/dump.py b/SAP/dump.py index bf55b50..d657357 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -43,6 +43,11 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, else: new_div = Div.objects.create(semester=old_semester + 1, calendar_year=old_year + old_semester % 2, division=division) + + div = Div.objects.get(semester=old_semester, calendar_year=old_year, division=division) + studivs = StudentDivision.objects.filter(division=div) + for sd in studivs: + StudentDivision.objects.create(student=sd.student, division=new_div) print("\033[92m{}\033[00m" .format(div_name + " promoted")) From f202fb5dbd15f1b70d4e6e7b42f10944e2d9ac04 Mon Sep 17 00:00:00 2001 From: Ankit Rishi Gupta <36430212+WizDemirider@users.noreply.github.com> Date: Thu, 9 Jan 2020 13:20:36 +0530 Subject: [PATCH 10/12] dont take electives for promotion --- SAP/dump.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SAP/dump.py b/SAP/dump.py index d657357..95480d9 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -21,7 +21,8 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, raise Exception("Div not Found") if with_pracs: - for div in Div.objects.filter(semester=old_semester, calendar_year=old_year, division_startswith=division): + pracs_and_class = [division, division + "1", division + "2", division + "3", division + "4"] + for div in Div.objects.filter(semester=old_semester, calendar_year=old_year, division_in=pracs_and_class): if classteacher: names = classteacher.strip().split(' ') teacher = Teacher.objects.get(user=AppUser.objects.get(first_name=names[0], last_name=names[1])) @@ -53,6 +54,7 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, def PromoteAllDivs(old_semester, old_year=current_year): for div in Div.objects.filter(semester=old_semester, calendar_year=old_year): + if len(div.division <= 2): PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False) From e6c855d5774243e1fce0f9f64e55eff2600b19cc Mon Sep 17 00:00:00 2001 From: Ankit Rishi Gupta <36430212+WizDemirider@users.noreply.github.com> Date: Thu, 9 Jan 2020 13:21:54 +0530 Subject: [PATCH 11/12] minor debug --- SAP/dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAP/dump.py b/SAP/dump.py index 95480d9..51db04a 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -55,7 +55,7 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, def PromoteAllDivs(old_semester, old_year=current_year): for div in Div.objects.filter(semester=old_semester, calendar_year=old_year): if len(div.division <= 2): - PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False) + PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False) def SAPDump(path, div_name, overwrite=False, reverse_names=False, classteacher=None): From 89629e14f37ad36d4b70cc735acfcc337f7540df Mon Sep 17 00:00:00 2001 From: Ankit Rishi Gupta <36430212+WizDemirider@users.noreply.github.com> Date: Thu, 9 Jan 2020 13:24:31 +0530 Subject: [PATCH 12/12] another debug --- SAP/dump.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAP/dump.py b/SAP/dump.py index 51db04a..d932a13 100644 --- a/SAP/dump.py +++ b/SAP/dump.py @@ -54,7 +54,7 @@ def PromoteDiv(div_name, old_semester, classteacher=None, old_year=current_year, def PromoteAllDivs(old_semester, old_year=current_year): for div in Div.objects.filter(semester=old_semester, calendar_year=old_year): - if len(div.division <= 2): + if len(div.division) <= 2: PromoteDiv(str(div), old_year=old_year, old_semester=old_semester, with_pracs=False)