Phc Module Updated

FusionIIIT/Fusion/urls.py

@@ -25,7 +25,10 @@
     url(r'^eis/', include('applications.eis.urls',namespace='eis')),
     url(r'^mess/', include('applications.central_mess.urls')),
     url(r'^complaint/', include('applications.complaint_system.urls')),
+<<<<<<< HEAD
+=======
     url(r'^healthcenter/', include('applications.health_center.urls')),
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
     url(r'^leave/', include('applications.leave.urls')),
     url(r'^notifications/', include('notification_channels.urls')),
     url(r'^placement/', include('applications.placement_cell.urls',namespace='placement')),

FusionIIIT/applications/globals/models.py

@@ -97,6 +97,11 @@ class ExtraInfo(models.Model):
     address = models.TextField(max_length=1000, default="")
     phone_no = models.BigIntegerField(null=True, default=9999999999)
     user_type = models.CharField(max_length=20, choices=Constants.USER_CHOICES)
+<<<<<<< HEAD
+    department = models.ForeignKey(DepartmentInfo, on_delete=models.CASCADE, null=True, blank=True)
+    profile_picture = models.ImageField(null=True, blank=True)
+    about_me = models.TextField(default='', max_length=1000, blank=True)
+=======
     department = models.ForeignKey(
         DepartmentInfo, on_delete=models.CASCADE, null=True, blank=True)
     profile_picture = models.ImageField(
@@ -113,10 +118,20 @@ def age(self):
         timedelta = timezone.localtime(
             timezone.now()).date() - self.date_of_birth
         return int(timedelta.days / 365)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 
     def __str__(self):
         return '{} - {}'.format(self.id, self.user.username)
 
+class HoldsDesignation(models.Model):
+    user = models.ForeignKey(User, related_name='holds_designations', on_delete=models.CASCADE)
+    working = models.ForeignKey(User, related_name='current_designation')
+    designation = models.ForeignKey(Designation, related_name='designees', on_delete=models.CASCADE)
+    held_at = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return '{} - {}'.format(self.user.username,self.designation)
+
 
 class HoldsDesignation(models.Model):
     user = models.ForeignKey(

FusionIIIT/applications/globals/views.py

@@ -968,7 +968,7 @@ def issue(request):
                     image = IssueImage.objects.create(
                         image=image, user=request.user)
                     issue.images.add(image)
-                except Exception as e:
+                except Exception:
                     pass
             issue.save()
             openissue = Issue.objects.filter(closed=False)
@@ -1008,7 +1008,7 @@ def view_issue(request, id):
                     image = IssueImage.objects.create(
                         image=image, user=request.user)
                     issue.images.add(image)
-                except Exception as e:
+                except Exception:
                     pass
             issue.save()
             form = IssueForm(instance=issue)

FusionIIIT/applications/health_center/admin.py

@@ -1,16 +1,30 @@
 from django.contrib import admin
 
+<<<<<<< HEAD
+from .models import (Ambulance_request, Appointment, Complaint, Doctor, Expiry,
+                     Hospital_admit, Medicine, Prescribed_medicine, Counter,
+                     Prescription, Schedule, Stock, Hospital)
+
+admin.site.register(Doctor)
+admin.site.register(Counter)
+admin.site.register(Hospital)
+admin.site.register(Expiry)
+=======
 from .models import (Ambulance_request, Appointment, Complaint, Doctor,
                      Hospital_admit, Medicine, Prescribed_medicine,
                      Prescription, Schedule, Stock, Stockinventory)
 
 admin.site.register(Doctor)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 admin.site.register(Appointment)
 admin.site.register(Ambulance_request)
 admin.site.register(Hospital_admit)
 admin.site.register(Complaint)
 admin.site.register(Stock)
+<<<<<<< HEAD
+=======
 admin.site.register(Stockinventory)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 admin.site.register(Prescription)
 admin.site.register(Medicine)
 admin.site.register(Prescribed_medicine)

FusionIIIT/applications/health_center/forms.py

@@ -0,0 +1,4 @@
+from django import forms
+
+class UploadTestFileForm(forms.Form):
+    file=forms.FileField()

FusionIIIT/applications/health_center/models.py

@@ -21,6 +21,13 @@ class Doctor(models.Model):
     doctor_name = models.CharField(max_length=50)
     doctor_phone = models.CharField(max_length=10)
     specialization = models.CharField(max_length=100)
+<<<<<<< HEAD
+    active = models.BooleanField(default=True)
+
+    def __str__(self):
+        return self.doctor_name
+
+=======
 
     def __str__(self):
         return self.doctor_name
@@ -30,6 +37,7 @@ class Health_Card(models.Model):
     health_card = models.CharField(max_length=20, primary_key=True)
     user_id = models.ForeignKey(ExtraInfo)
 
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 
 class Complaint(models.Model):
     user_id = models.ForeignKey(ExtraInfo)
@@ -42,6 +50,8 @@ class Stock(models.Model):
     medicine_name = models.CharField(max_length=100)
     quantity = models.IntegerField(default=0)
     threshold = models.IntegerField(default=10)
+<<<<<<< HEAD
+=======
 
     def __str__(self):
         return self.medicine_name
@@ -53,16 +63,79 @@ class Medicine(models.Model):
     quantity = models.IntegerField(default=0)
     days = models.IntegerField(default=0)
     times = models.IntegerField(default=0)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
+
+    def __str__(self):
+        return self.medicine_name
+
+class Hospital(models.Model):
+    hospital_name=models.CharField(max_length=100)
+    phone=models.CharField(max_length=10)
+    def __str__(self):
+        return self.hospital_name
 
+
+class Expiry(models.Model):
+    medicine_id=models.ForeignKey(Stock)
+    quantity = models.IntegerField(default=0)
+    supplier=models.CharField(max_length=50)
+    expiry_date=models.DateField()
+    returned=models.BooleanField(default=False)
+    return_date=models.DateField(null=True,blank=True)
+    date=models.DateField(auto_now=True)
+    def __str__(self):
+        return self.medicine_id.medicine_name
 
-class Stockinventory(models.Model):
+class Medicine(models.Model):
+    patient = models.ForeignKey(ExtraInfo)
     medicine_id = models.ForeignKey(Stock)
-    date = models.DateTimeField(auto_now_add=True)
     quantity = models.IntegerField(default=0)
+    days = models.IntegerField(default=0)
+    times = models.IntegerField(default=0)
 
     def __str__(self):
         return self.medicine_id.medicine_name
 
+<<<<<<< HEAD
+class Schedule(models.Model):
+    doctor_id = models.ForeignKey(Doctor)
+    day = models.IntegerField(choices=Constants.DAYS_OF_WEEK)
+    from_time = models.TimeField(null=True,blank=True)
+    to_time = models.TimeField(null=True,blank=True)
+    room = models.IntegerField()
+    date = models.DateField(auto_now=True)
+
+
+class Counter(models.Model):
+    count=models.IntegerField(default=0)
+    fine=models.IntegerField(default=0)
+    doc_count=models.IntegerField(default=0)
+
+    def doctor_count(self):
+        self.doc_count+=1
+        return ""
+    def increment(self):
+        self.count+=1
+        return ""
+    def increment_fine(self):
+        self.fine+=1
+        return ""
+    def range_count(self):
+        if self.count==0:
+            dif=0
+        elif self.count<=4:
+            dif=self.doc_count-self.count
+        else:
+            dif=self.count-self.doc_count
+        return range(dif)
+    def empty_fine(self):
+        self.count=0
+        self.fine=0
+        return ""
+    def empty_count(self):
+        self.count=0
+        return ""
+=======
 
 class Schedule(models.Model):
     doctor_id = models.ForeignKey(Doctor)
@@ -72,6 +145,7 @@ class Schedule(models.Model):
     room = models.IntegerField()
     date = models.DateField(auto_now=True)
 
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 
 class Appointment(models.Model):
     user_id = models.ForeignKey(ExtraInfo)
@@ -90,17 +164,25 @@ class Prescription(models.Model):
     details = models.CharField(max_length=100)
     date = models.DateField()
     test = models.CharField(max_length=200, null=True, blank=True)
+<<<<<<< HEAD
+=======
     test_file = models.FileField(
         upload_to='healthcenter/', null=True, blank=True)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
     appointment = models.ForeignKey(Appointment, null=True, blank=True)
 
     def __str__(self):
         return self.details
 
 
 class Prescribed_medicine(models.Model):
+<<<<<<< HEAD
+    prescription_id = models.ForeignKey(Prescription)#pk
+    medicine_id = models.ForeignKey(Stock)#pk
+=======
     prescription_id = models.ForeignKey(Prescription)
     medicine_id = models.ForeignKey(Stock)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
     quantity = models.IntegerField(default=0)
     days = models.IntegerField(default=0)
     times = models.IntegerField(default=0)
@@ -121,7 +203,11 @@ class Hospital_admit(models.Model):
     user_id = models.ForeignKey(ExtraInfo)
     doctor_id = models.ForeignKey(Doctor, null=True, blank=True)
     hospital_doctor = models.CharField(max_length=100)
+<<<<<<< HEAD
+    hospital_name = models.ForeignKey(Hospital)
+=======
     hospital_name = models.CharField(max_length=50)
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
     admission_date = models.DateField()
     discharge_date = models.DateField(null=True, blank=True)
     reason = models.CharField(max_length=50)

FusionIIIT/applications/health_center/urls.py

@@ -8,5 +8,9 @@
 
     url(r'^$', healthcenter, name='healthcenter'),
     url(r'^compounder/$', compounder_view, name='compounder_view'),
+<<<<<<< HEAD
+    url(r'^student/$', student_view, name='student_view')
+=======
     url(r'^student/$', student_view, name='student_view'),
+>>>>>>> da2946e1cfafc8a828075685182d40ebba922cd8
 ]