Merge pull request #1 from alishirmohammadi/development

Development
SutCEGoS · Jul 12, 2019 · 6fcbf37 · 6fcbf37
2 parents 8451a2d + f0f7ec2
commit 6fcbf37
Show file tree

Hide file tree

Showing 24 changed files with 5,272 additions and 37 deletions.
diff --git a/apps/base/templates/index.html b/apps/base/templates/index.html
@@ -124,43 +124,53 @@ <h5 class="text-white mr-4">رزرو اتاق مطالعه</h5>
             <h2 class="mb-4 mx-2 px-4 text-white border-right-white">اعضای شورا</h2>
             <div class="row" style="justify-content: space-evenly">
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/ali_babaei.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">علی بابایی <span
-                            class="badge badge-light">تاسیسات</span></h5>
+                    <img src="{% static "img/members/mohammad_s.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">محمد شهیدی <span
+                            class="badge badge-light">دبیر</span></h5>
+                </div>
+                <div class="col-md-3 my-3 memberHidden">
+                    <img src="{% static "img/members/arshia.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">ارشیا مقیمی <span
+                            class="badge badge-light">دبیر داخلی و عضو کمیتهٔ آموزش</span></h5>
                 </div>
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/amin_isaai.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">امین عیسائی <span
-                            class="badge badge-light">آموزش</span></h5>
+                    <img src="{% static "img/members/amirhossein_h.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">امیرحسین هادیان <span
+                            class="badge badge-light">نائب دبیر</span></h5>
                 </div>
             </div>
             <div class="row" style="justify-content: space-between">
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/hoda_torabi.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">هدی ترابی <span
-                            class="badge badge-light">روابط عمومی</span></h5>
+                    <img src="{% static "img/members/amirhossein_a.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">امیرحسین عاصم یوسفی <span
+                            class="badge badge-light">مسئول تأسیسات</span></h5>
                 </div>
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/rasoul_ghasemi.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">رسول قاسمی <span
-                            class="badge badge-light">نایب دبیر - ورزش</span></h5>
+                    <img src="{% static "img/members/ali.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">علی شیرمحمدی <span
+                            class="badge badge-light">مسئول کمیتهٔ فنی</span></h5>
                 </div>
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/hoora_aboutalebi.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">حورا ابوطالبی <span
-                            class="badge badge-light">دبیر</span></h5>
+                    <img src="{% static "img/members/mohammad_a.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">محمد آذری<span
+                            class="badge badge-light">مسئول کمیتهٔ آموزش </span></h5>
                 </div>
             </div>
             <div class="row" style="justify-content: space-evenly">
-{#                <div class="col-md-3 my-3 memberHidden">#}
-{#                    <img src="{% static "img/members/mr_jafarzadeh.png" %}" class="rounded-top">#}
-{#                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">محمدرضا جعفرزاده <span#}
-{#                            class="badge badge-light">؟؟؟؟؟</span></h5>#}
-{#                </div>#}
                 <div class="col-md-3 my-3 memberHidden">
-                    <img src="{% static "img/members/parsa_salavati.png" %}" class="rounded-top">
-                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">پارسا صلواتی <span
-                            class="badge badge-light">فنی - مالی و اموال</span></h5>
+                    <img src="{% static "img/members/mahdi.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">مهدی حاجی‌محمدعلی <span
+                            class="badge badge-light">مسئول مالی و عضو کمیتهٔ آموزش</span></h5>
+                </div>
+                <div class="col-md-3 my-3 memberHidden">
+                    <img src="{% static "img/members/sorush.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">سروش وفایی‌تبار <span
+                            class="badge badge-light">مسئول اموال و عضو کمیتهٔ فنی</span></h5>
+                </div>
+                <div class="col-md-3 my-3 memberHidden">
+                    <img src="{% static "img/members/hossein.jpg" %}" class="rounded-top">
+                    <h5 class="bg-primary text-white p-2 mb-0 text-center rounded-bottom">حسین آقامحمدی<span
+                            class="badge badge-light">عضو کمیتهٔ فنی و آموزش</span></h5>
                 </div>
             </div>
             <div class="mt-4 text-center ">
@@ -181,6 +191,18 @@ <h4 class="modal-title ml-auto">
                         </button>
 
                     </div>
+                    <div class="modal-body">
+                        <h4>دوره&zwnj;ی ۹۷-۹۸ </h4>
+                        <ul>
+                            <li>حورا ابوطالبی <span class="text-muted">دبیر</span></li>
+                            <li>رسول قاسمی <span class="text-muted">نایب دبیر - ورزش</span></li>
+                            <li>هدی ترابی <span class="text-muted">روابط عمومی</span></li>
+                            <li>امین عیسائی <span class="text-muted">آموزش</span></li>
+                            <li>پارسا صلواتی <span class="text-muted">فنی - مالی و اموال</span></li>
+                            <li>علی بابایی <span class="text-muted">تأسیسات</span></li>
+                        </ul>
+                    </div>
+
                     <div class="modal-body">
                         <h4>دوره&zwnj;ی ۹۶-۹۷ </h4>
                         <ul>

diff --git a/apps/course/management/commands/updatecourses.py b/apps/course/management/commands/updatecourses.py
@@ -56,7 +56,7 @@ def create_course(course_name, course_number):
 
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        url = "http://term.inator.ir/courses/list/38/"
+        url = "kttp://term.inator.ir/courses/list/38/"
         data = urlopen(url)
         courses_list = json.loads(data.read().decode('utf8'))
 

diff --git a/apps/locker/models.py b/apps/locker/models.py
@@ -6,11 +6,15 @@
 
 # Create your models here.
 class rack(models.Model):
+        CONDITION = Choices((0, 'available'),
+                            (1, 'unavailable'),
+                            )
         name = models.CharField(max_length=3)
         receiver = models.ForeignKey(Member,blank=True,null=True, on_delete=models.CASCADE)
         payment = models.BooleanField(default=False)
         receivie_date = models.DateTimeField(auto_now_add=True)
-        condition = models.BooleanField(default=True)
+        condition = models.PositiveSmallIntegerField(choices=CONDITION,
+                default=0)
         def __str__(self):
             return self.name
 class sell(models.Model):

diff --git a/apps/locker/views.py b/apps/locker/views.py
@@ -20,17 +20,16 @@ def calculate_difference(x,y):
 @login_required
 def lock(request):
     theRacks = rack.objects.filter(receiver=request.user)
-    broken_lockers = ['A23', 'A42', 'B13', 'B22', 'B23', 'B32', 'B41', 'C21',
-            'C41', 'D11', 'D12', 'D23', 'E11', 'E12', 'E13', 'E21', 'E22',
-            'E41', 'E42', 'F11', 'F12', 'F13', 'F21', 'F23', 'F32', 'F41',
-            'F42', 'F43', 'G11', 'G12', 'G13', 'G22', 'G41', 'G42', 'G43',
-            'H11', 'H12', 'H23', 'H33', 'H42', 'I23', 'I33', 'J11', 'J12',
-            'J13', 'J21', 'J23', 'J41', 'K11', 'K12', 'K21', 'K22', 'K23',
-            'K32', 'L13', 'L22', 'L31', 'L32', 'L33', 'L42', 'L43', 'O11',
-            'O12', 'O13', 'O21', 'O31', 'O33', 'N13', 'N21', 'N22', 'N23',
-            'N32', 'N33', 'N41', 'Q11', 'Q12', 'Q21', 'Q22', 'Q31', 'Q32',
-            'Q33', 'Q41', 'Q42', 'P13', 'P21', 'P22', 'P23', 'P31', 'P33',
-            'P42', 'P43',]
+    broken_lockers = ['A42', 'B23', 'B41',
+            'D11',
+            'F42', 'G12', 'G22', 'G42', 'G43',
+            'H12', 'J12',
+            'K23',
+            'K32', 'K42',
+            'O13', 'N22',
+            'N32', 'N41', 'Q21',
+            'P13', 'P22', 'P23', 'P31',
+            ]
     racks = rack.objects.all()
     for track in racks:
         if sell.objects.filter(locker=track):

diff --git a/deployscript.sh b/deployscript.sh
@@ -7,7 +7,7 @@ log_file="$log_directory$log_file_name"
 mkdir -p $log_directory
 touch $log_file
 
-exec &> >(tee -a "$log_file")
+# exec &> >(tee -a "$log_file")
 
 echo Deploy started
 echo User: $USER

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+import multiprocessing
+
+bind = "unix:/home/shora/website-django/gunicorn.sock"
+workers = 4
+errorlog = "/home/shora/logs/shora_gunicorn.log"
+loglevel = "debug"
+proc_name = "shora"
+