From 6b434071bd21408de393a3ea953a8fdb04078e41 Mon Sep 17 00:00:00 2001 From: revatim Date: Thu, 11 Apr 2019 17:03:27 +0530 Subject: [PATCH 1/5] PG students cannot apply for rebate --- FusionIIIT/Fusion/fusion.db | Bin 4722688 -> 4722688 bytes .../applications/central_mess/models.py | 6 +++--- FusionIIIT/applications/central_mess/views.py | 7 +++++++ .../templates/messModule/applications.html | 10 ++++++---- FusionIIIT/templates/messModule/views.html | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index d1b6b6fcd5f55c45b55a56cb3f4d5ab59047769c..4b493212eb46b8f5ecf312f2a02564aa94a520e8 100644 GIT binary patch delta 2914 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 AjQ{`u diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py index 688ec2ea1..216b1c32e 100644 --- a/FusionIIIT/applications/central_mess/models.py +++ b/FusionIIIT/applications/central_mess/models.py @@ -1,6 +1,6 @@ import datetime from django.db import models -from applications.academic_information.models import Student +from applications.academic_information.models import (Student, Holiday) # Create your models here. LEAVE_TYPE = ( @@ -234,7 +234,7 @@ def __str__(self): class Menu_change_request(models.Model): dish = models.ForeignKey(Menu, on_delete=models.CASCADE) - # student_id = models.ForeignKey(Student, on_delete=models.CASCADE) + student_id = models.ForeignKey(Student, on_delete=models.CASCADE) reason = models.TextField() request = models.CharField(max_length=100) status = models.CharField(max_length=20, choices=STATUS, default='1') @@ -247,7 +247,7 @@ def __str__(self): class Feedback(models.Model): student_id = models.ForeignKey(Student, on_delete=models.CASCADE) mess = models.CharField(max_length=10, choices=MESS_OPTION, default='mess1') - # mess_rating = models.PositiveSmallIntegerField(default='5') + mess_rating = models.PositiveSmallIntegerField(default='5') fdate = models.DateField(default=datetime.date.today) description = models.TextField() feedback_type = models.CharField(max_length=20, choices=FEEDBACK_TYPE) diff --git a/FusionIIIT/applications/central_mess/views.py b/FusionIIIT/applications/central_mess/views.py index 661aee245..e4cf7d4d2 100644 --- a/FusionIIIT/applications/central_mess/views.py +++ b/FusionIIIT/applications/central_mess/views.py @@ -70,6 +70,10 @@ def mess(request): rebates = Rebate.objects.filter(student_id=student).order_by('-app_date') splrequest = Special_request.objects.filter(student_id=student).order_by('-app_date') mess_optn = Messinfo.objects.get(student_id=student) + if student.programme == 'B.Tech' or student.programme == 'B.Des': + programme = 1 + else: + programme = 0 # newmenu = Menu_change_request.objects.all() # meeting = Mess_meeting.objects.all() # minutes = Mess_minutes.objects.all() @@ -195,6 +199,7 @@ def mess(request): 'sprequest': sprequest, 'splrequest': splrequest, 'sprequest_past': sprequest_past, + 'programme':programme, 'count1': count1, 'count2': count2, 'count3': count3, @@ -260,6 +265,7 @@ def mess(request): 'current_date': current_date, 'count': count, 'rebates': rebates, + 'programme': programme, 'meeting': meeting, 'minutes': minutes, 'sprequest': sprequest, @@ -295,6 +301,7 @@ def mess(request): 'rebates': rebates, 'splrequest': splrequest, 'form': form, + 'programme': programme, 'desig': desig } diff --git a/FusionIIIT/templates/messModule/applications.html b/FusionIIIT/templates/messModule/applications.html index c0525af36..7c3c99a31 100644 --- a/FusionIIIT/templates/messModule/applications.html +++ b/FusionIIIT/templates/messModule/applications.html @@ -5,20 +5,22 @@ {% comment %}The tab menu starts here!{% endcomment %}
+ {% if programme == 1 %} Leave Requests + {% endif %} - + Vacation Food Requests Special Food Requests
-
+ -
+
Apply for Food During Vacation diff --git a/FusionIIIT/templates/messModule/views.html b/FusionIIIT/templates/messModule/views.html index 328b48c46..a61e85c38 100644 --- a/FusionIIIT/templates/messModule/views.html +++ b/FusionIIIT/templates/messModule/views.html @@ -281,7 +281,7 @@

-
+
{% comment %}Form Tag starts here!{% endcomment %} From 016fd65cd2190652be2630b1837f7704834069b9 Mon Sep 17 00:00:00 2001 From: revatim Date: Fri, 12 Apr 2019 11:14:36 +0530 Subject: [PATCH 2/5] roll number ui --- FusionIIIT/Fusion/fusion.db | Bin 4722688 -> 4722688 bytes FusionIIIT/applications/central_mess/views.py | 4 ++-- .../templates/messModule/messactivities.html | 4 ++-- .../messModule/respondtorequests.html | 4 ++-- FusionIIIT/templates/messModule/splreq.html | 2 +- .../templates/messModule/view_feedback.html | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index 4b493212eb46b8f5ecf312f2a02564aa94a520e8..007a7703704f45678dc7f79248945698ca511561 100644 GIT binary patch delta 1187 zcma*kO>7%Q6bJB~*|pbB)-#S<*Kq@>w@FH95_@NN{ju9X;yA4XYNb@59xAmMic|7Y z19eCUAevC56-6y^N!a$515%Gx6=2jJsQQ6u4n*bv2t_3Vi31l@AVLBp#B+<(V{`aP zBh7zi-g`5xUdFI& zO^>Hinr3GBzGs!~(f<$Y%+{669sWNxDPd}(5|1UpcRhZhcPxfJp+DBy^r6t;k^Tq%S%PJMPa{4v>e%5&h|z1bID z9GNmE%dhEX$toJw>#t0WXI?s%JXw5WdS+%~Y=WUM~<4MadQCsOp!_r-DPHkaq4&mato!+&5%qZ0=+}8(hGE&9-=ml)CY-Zn@VM&MMbEkKDg1+@duM^Y=w1- zu_U*5sMlin9mN0XQ-3~-nd$!YmD+)s?)q2NcFdAaVpRn@K^tfX9bgxD40M9W!EVq6 zx#IKpJF#1#GYf^nxeAlb{dugDe=}iPhXUs&rZWNZ_T}#1Q7g zzvr3}CKez2BiGj;eJDxax*v>b73_6*|G&9gS!qh{6~qQdT;SMQr+xue#m|Gt~SRT4(9(R b4}DX(|7QM1W|PrN`Au|kzv(aYpAY>9aHMoX delta 1033 zcma*l-Ahw(7zgn4J3DS_=bYc1ubY;esacjguWmb)y1AS}nvxlg!iA(YQ9~@l3Kgky z5xrR2(I7Aox?Cdlqo6Dy%8O)OR798+bkSWeLPTUe{s+7G+ z6vd2C6!K6MC6ASOQ2T5|a3OAP%vFaFKli?1nnoAq&K8Mgn)){yE7fDA2++U;7?1?a zz(QiB$?{v9AUj2`CV4bPDwAZzCoB3YodQz92C_=C{-!k1DVA%Bpvh{P;FAQ^Lu#5? zhutP9PEpkaQ4>66K98i9E2OWRy(VRFc#6Wm@pt?cf5PwZE4+xG62~+!VqAct^_{ntfPl!+6|Rr`KK4vpDIk?~3@uOxZb?X$=< zMBUQk<96TxxgZa01e-uUiH|##GgdR!D7=gx;z>M!Td=lXvltUC-!<=~M~29sO4pZ5 zwBRv5zjPJRf@-8Jxe95)tGkz6pa5(Jg`fx&gDs#0Yz5muDcBBnfHL3)0uX@&WS{^Q zlmib~pYH=2*a>!l-Jk+gf-2w#0peb&e(hrJnr={}XV_g!lg1y_Ifyo!Nc3lQWh!%% zVcr;5qQWHEvsOLtXHHrIl)*OAdyS5`B}gW#f?=90G>8?5RK=0aL;|7ULQVp)&O~B* zKo5dFB%s$UznEA+1%|&dRGSezpf+?jiQ#Cw91exMTL(Mk2IKZ4x5H?2 {% for items in members %} {% if items.designation.name == "mess_committee_mess1" or items.designation.name == "mess_convener_mess1" %} -

{{ items.user }} - {{ items.user.first_name }} {{ items.user.last_name }} +

{{ items.user|truncatechars:7 }} - {{ items.user.first_name|title }} {{ items.user.last_name|title }} {% if items.designation.name == "mess_convener_mess1" %} (Mess Convener) {% endif %} @@ -46,7 +46,7 @@ {% for items in members %} {% if items.designation.name == "mess_committee_mess2" or items.designation.name == "mess_convener_mess2" %} -

{{ items.user }} - {{ items.user.first_name }} {{ items.user.last_name }} +

{{ items.user|truncatechars:7 }} - {{ items.user.first_name|title }} {{ items.user.last_name|title }} {% if items.designation.name == "mess_convener_mess2" %} (Mess Convener) {% endif %} diff --git a/FusionIIIT/templates/messModule/respondtorequests.html b/FusionIIIT/templates/messModule/respondtorequests.html index 5c4ccfe44..5aafd9cf6 100644 --- a/FusionIIIT/templates/messModule/respondtorequests.html +++ b/FusionIIIT/templates/messModule/respondtorequests.html @@ -71,7 +71,7 @@

- {{item.student_id.id}} + {{ item.student_id.id|truncatewords:1|slice:"-4" }}

@@ -135,7 +135,7 @@

Application Date: {{item.app_date}}
- Student: {{item.student_id.id}} + Student: {{ item.student_id.id|truncatewords:1|slice:"-4" }}
Reason: {{item.purpose}}
diff --git a/FusionIIIT/templates/messModule/splreq.html b/FusionIIIT/templates/messModule/splreq.html index ca86cd6ac..38d59c041 100644 --- a/FusionIIIT/templates/messModule/splreq.html +++ b/FusionIIIT/templates/messModule/splreq.html @@ -29,7 +29,7 @@ {{var.app_date}} - {{var.student_id.id}} + {{var.student_id.id|truncatewords:1|slice:"-4"}} {{var.start_date}}-{{var.end_date}} {# {{var.end_date}}#} diff --git a/FusionIIIT/templates/messModule/view_feedback.html b/FusionIIIT/templates/messModule/view_feedback.html index a8f41b317..a52e70447 100644 --- a/FusionIIIT/templates/messModule/view_feedback.html +++ b/FusionIIIT/templates/messModule/view_feedback.html @@ -45,7 +45,7 @@ {% if item.feedback_type == 'Food' %} {{item.fdate}} - {{item.student_id.id}} + {{ item.student_id.id|truncatewords:1|slice:"-4" }} {{item.feedback_type}} {{item.description}} @@ -75,7 +75,7 @@ {% if item.feedback_type == 'Cleanliness' %} {{item.fdate}} - {{item.student_id.id}} + {{ item.student_id|truncatewords:1|slice:"-4" }} {{item.feedback_type}} {{item.description}} @@ -105,7 +105,7 @@ {% if item.feedback_type == 'Maintenance' %} {{item.fdate}} - {{item.student_id.id}} + {{ item.student_id.id|truncatewords:1|slice:"-4" }} {{item.feedback_type}} {{item.description}} @@ -135,7 +135,7 @@ {% if item.feedback_type == 'Others' %} {{item.fdate}} - {{item.student_id.id}} + {{ item.student_id.id|truncatewords:1|slice:"-4" }} {{item.feedback_type}} {{item.description}} From 88ef69cc6dca31afd5e02f8f72d969d17a93a2d6 Mon Sep 17 00:00:00 2001 From: revatim Date: Thu, 18 Apr 2019 10:10:22 +0530 Subject: [PATCH 3/5] Special req past --- FusionIIIT/Fusion/fusion.db | Bin 4722688 -> 4722688 bytes .../applications/central_mess/handlers.py | 4 +- .../templates/messModule/respondmenu.html | 6 +-- FusionIIIT/templates/messModule/splreq.html | 38 ++++++++++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index 4a079c666c0b330485829685efd34ea1faa195fd..99e1681280d22a3a3b3cbd47a9e838dd42a6f286 100644 GIT binary patch delta 3545 zcmeHJdvH|M8Nctx?!EUcY@Q@p?rsv3kWF&$W*^y2ng=0(l|YDCTdk99cJGokaX0LP zfZA#TxfvV>19Z5hQV}ZEq97V%75@N-##UOZI675u^fHcGUw{nMT4<-|E=f9Qo$B=8 z?(A>Bo&EjJx8LJ_=bU>Vei*wKVxnkHA%YMi2!i?$1et)}%eFY{(ZZ*CuLyJng5W2{ z3MWJ0Ab^~!Rz1zI0BvkTfyC65G(^8kSBa0ye%9P_6Qq=0pWU~N?`d5 z{G0qS{vf}dPx0NnhtKE!&b`h3j(e25pBv_GIjyGR6ziXZ{KW^S=4x5*n>&$s( z()5ApkETPWou-YZxM`)yZ7O8X-@~3{pJKPOYuQ`aHnxlf%mwC6=6PlZGs^Tat&D@g z=}+jF=mYe9bc|k3yXiU9dFplQX=)pFC$*BQpjh%l^7rIp8;z%vJ;TvhOi3V9+kRPBoC`*6 zcsa8?o{C1IpJ2jxdjHdqu0lhsYE)IiYL4bjpw3^qk{@#BJe`AJ)TY^m76&nFG1UbgGwwM zOi&xn){UR7Lm@B-9D;x#GiU3lyo1GNq#I%8(j<8r+lLjP%}BRU!{5$rG~3ueWkj9& zl)IV3|x0KLQh-jstpi^omaFQpSBo< z`nn#SEdxguKdxh_FqOS4oD?Ee%0U#_8 zb28mm=04qSW`h_goLTYZey#-)r^xS_45D#%#gYS@GfOnF z2H~G2Mh|e+x7m(wCg(E-!RJo9a!GPSjpVM8<;C%M7*>m{ptFMVuL(MX(O3#XiG>tH zSVidFWF#$4vEhlPjV3E)M*X>bVK1-!74*MSx7M)0=+JBo+; zmC(TT;lZd=yfJu3Uw<&+6x-vWXe^x)+xye0n6e%+Ly34gm6TzU{%p+~@@&VGKA2cx zo8d&8SYdVcz$TT$lIG)Uo0u*IO0ov>+*p6#Ki?1eQ>6OpV|NrN= zufU|J6S%6+Q}rTMFIM#uRkx}7d{q}!-LC2mRWDWbGF2~E_3Koh-GbKCF8Pv6ur>2)F{i02jb#;4k1k@DAKCUk9(i^LPrj zbT1$YoJBe91n>sFl^8L^^SuFr1J5BEH$)adH#>lKw9ZRH3Yrdv1N#y9yzkGLB=2rO zQ#gha!<=@g#oP6r{^P%kwUWPhzkc6nqsK@4lB@AEpx&usES z_#hfGXEymuKPX_aVgxG|9^uz;s(B0jKAl6gVs9Y7){2J$_haZ<7-9k)FHQs?8Z*U- zruRzekD|_K8MfFJTqO390!}LTWjN+vrUieZIvt&bMwP>UWE^7Je zqWYeQqJ;Z`p@FQMo&>y;#a4f%cXGf}U)v!0{VsXo$UN<_6N2b)%W{wGb$kAk)Kg#Y zb;+5?-&!85n1_Cfn2-p{zQ#6D=a{|J50MDAQ&>!HAT;~Kk`=|YH4`O{ZK9rQ*?^6? z=zO0K8?&c^eS=E&KAHWnpq}>bj3pL?miplRurqW^9g`Q~Gc>CPGV4ut5GJ>;d z+5?R_Sy{<9$QbuHHO?GWrh!b`L1qyOLStS!|E^AK6pmq7S*PvX)nw1R zM%)t)`u*NMN!A8;HHjFyRGWC9u~^%;tI7IJ!k2e7EwEnW#8EY}a?GRE?P@xiS#e!! zCzjb;+4>?12L?Y4AG|-~<_+F4H=W{S%x^sPIUt5a<&GFPouI!$Yy-)i*Zm-vy LdHkj&Hy!yGUFty9 delta 2626 zcmeHJeNY@{9p3Nn-4{3rT#kc1xZ|UI+}=m-j*o#&pkP~$K&Bn7ZCVaEQj+$L9AK(r zCkcf;V{|5j+MODcDHt71>J$TEHJYYI<0u-^*lLV5x@jhfHYSit)tS)I_eesVj$_ro zy}Rdj-{*OLzx}q4v0OrbPPd=od|*k5d_%_&n=_nJ{0?Q$C5(w!k929bO@^864LlZ{%!sg|8@Qa{#pJBzLB?cA8;4BpKz~o z2e|EAlnZlfI6KF%@3N=aBiq?s>}K{s*3AOu&&+R_AOCz!-c*ru9Hn^s0A7#kZ#-9Rox0+>NmDQ7IB_3z)JU0A zH!B`PNoxikMDk94&|r3efw*(0xU=1RH z5F57YTV>U)UoTKu{nry&CP&+sn`#9qg{m(%V9)#Pmd?-JOxHEqd!Y zq0vz;KNIcmm%E;dBuYF=soWjyi3~nHP*R+tJ;kM^$-HY61a0J9V}6vKq4;D^sM;H> z_IoS6K7W&rtlbXHB)&TkWr^RH_1=fZu3(SUC33i>igPeGUOX z1TTVK&=7*Uf*r0g{Kh57OPEvD{QF;%Zevd#X+*B(54r)TFUQ|Ar_KVkc_rk z%G#IH`@J>>l46z(4nq}+zry2bipRU*XpIsK71Alu^-p3r(iz_TzWRA`+68dy$Iose#QO4)z8@g#`53?_FN;bw;}79$3Ok89sj*o-(;?`u_En zJm3j>Jc?3PhW!h&28Co8)-t!=Qc2%-`er5tB8|ntJOXZk_kr$E*Ue4I3z;A}e?~Co z&xoDns3*B$NraFf07M!@y0Kv?<46OHOd{a-;QKK04W(x}lJ(&iTA|^A_H;ny%u9LZ5BEW9o3l*O9DebW_-58atvLC zHp9P97hF~+;PKNC&q1^pEuEI>5A=e`b(f4ZwQ3>%|KI;@2jD&1h-v0(&9rG|u4dXb zGfy+~HB;71hh`RNW}#*}HPfY;MVeWxnI)Q8s+sp`W|?M|Yi5OJR%)hOGZoGBXr@;) zeVXZ?G1n0CY97oYUKY&Z%ci=pD3!DM7Q|Sw@0DTq&sz2J4zic{j`xiP7 z{s{A20O!D2@H4ofo`9LgfqudrxS!&|Gysg>>Pt@s zn2${NA?JH5lTNiE)r5PK-=3NmYa$>f{Z@JqE_Ytx6(OJB%TruGYr=V*WRvEu07MWX zWSG0EoL6!<1m+4GO#eRt#)pPr*zcAV&@@itj133%_DZ!$ zAD7i!U3RG!z0ai*`fR284qBSbO;khF7`chs%k~_&InkIC0cCJ&d0#AM8>u6h6U~Mz zu7HU!lGEzaPF<8MPg_BNV=YMsb>#bl!>;q|LyZa9g#<1R}t(gJ5FxG z7ZD$Pey9Om(odz0;-dJN@Y>OWx>J~uJz6WG#v)#a(-_IaGH7yQGIdQ&shd&iiPv!( z)1%W1^+BkWFhh~49n0*MK)~6bLUTPK(iD|+?p@yH}Np1`K3$~WJ!hDTd4+Bam z;}b<{7!whMyS=OLw2YMNj~A&{<7A2YO;rCRUiW2# Date of Application: {{list.app_date}}
- Student: Mess Convener + Student: {{ list.student_id|truncatewords:1|slice:"-4" }}
Reason: {{list.reason}}
@@ -81,7 +81,7 @@

Accepted

Date of Application: {{list.app_date}}
- Student: Mess Convener + Student: {{ list.student_id|truncatewords:1|slice:"-4" }}
Reason: {{list.reason}}
@@ -100,7 +100,7 @@

Rejected

Date of Application: {{list.app_date}}
- Student: Mess Convener + Student: {{ list.student_id|truncatewords:1|slice:"-4" }}
Reason: {{list.reason}}
diff --git a/FusionIIIT/templates/messModule/splreq.html b/FusionIIIT/templates/messModule/splreq.html index 38d59c041..a5a7aeaac 100644 --- a/FusionIIIT/templates/messModule/splreq.html +++ b/FusionIIIT/templates/messModule/splreq.html @@ -6,6 +6,9 @@ Special Request + + Accepted Requests +
@@ -59,6 +62,41 @@
+
+
+ + + + + + + + + + + + + {% for var in sprequest_past %} + + + + +{# #} + + + + {% endfor %} + + +
DateStudent IdRequest DatesFoodpurpose
+ {{var.app_date}} + + {{var.student_id.id|truncatewords:1|slice:"-4"}} + {{var.start_date}}-{{var.end_date}}{{var.end_date}}{{var.item1}}, {{var.item2}}{{var.request}}
+
+
+ + - {% endblock %} \ No newline at end of file From 51359ba50d8962156e76f0fc924b41df0b78bd9a Mon Sep 17 00:00:00 2001 From: revatim Date: Thu, 18 Apr 2019 11:27:02 +0530 Subject: [PATCH 5/5] button change --- FusionIIIT/Fusion/fusion.db | Bin 4722688 -> 4722688 bytes .../messModule/respondtorequests.html | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index 6dbe05140a7234dd3615ed525486b4bebb53f890..872bcb6755125d42ea82645731d46e37bf4547e8 100644 GIT binary patch delta 411 zcmXBQOEW@Y9LI6zDCtThmqH?haxQhA{7I}!s3dWkX7lXsJp-o9vFd9@WL33gAXRa50fwj(=Y=82*NDP!90Xu0m85d zOAvu&SbGJ` z{rK%-f54q{emT1Ki0$2TZ+*0s#Qu}_`$LRgpL7iCQMZt7w$9FLTJ7?J8P!&qou;lT ot!BMZmy~LwQZF0kLpBo@e94%kgk(AWzf)z5X_8se51(Iu0mF@jHUIzs delta 345 zcmWm8J5s^`6hKh}K_CPK@eeA9_(M@7N`fB{G&FQ(0dFZV;~QJu0oIo4q;SU4McBFl zdmFFC>Cb2~iHz`2Fr3F?-*CpFVyHw^qAI3JOl4Xnu98qms#q$iH?hBN?MAEJ^y;4L zx=!QX4{W57!3?sy U49nS0&3GyOSkZ783|`;=0Q4|!8vp