Merge pull request #404 from PROTO-TYPE-SOLUTIONS/development

Development

.gitignore

@@ -293,4 +293,7 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-# End of https://www.toptal.com/developers/gitignore/api/django
+# End of https://www.toptal.com/developers/gitignore/api/django
+
+
+backend/makeeasyhmis/static/

README.md

@@ -97,4 +97,8 @@ You will notice that we have a Role and a Group. A group is associated with perm
 If not installed already, install celery and redis INSIDE YOUR VIRTUAL ENV
 ``pip install celery redis``
 Run Celery: ``celery -A makeeasyhmis worker --loglevel=INFO``
-Run Redis: ``redis-cli -h 127.0.0.1 -p 6379``
+Run Redis: ``redis-cli -h 127.0.0.1 -p 6379``
+
+Generated PDFs
+``http://127.0.0.1:8080/download_{service_name}_pdf/{id}``
+i.e ``http://127.0.0.1:8080/download_invoice_pdf/24``

backend/Dockerfile

@@ -1,64 +1,7 @@
-# pull official base image
-FROM python:3.11-slim-bullseye as builder
-
-# set work directory
-WORKDIR /usr/src/app
-
-# set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
-# install psycopg2 dependencies
-RUN apt-get update \
-    && apt-get install -y postgresql-client gcc python3-dev musl-dev \
-    && apt-get install -y netcat
-
-# install dependencies
-RUN pip install --upgrade pip
-COPY ./requirements.txt .
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
-
-
-# pull official base image
-FROM python:3.11-slim-bullseye
-
-# create directory for the app user
-RUN mkdir -p /home/app
-
-# create the app user
-RUN groupadd app && useradd -m -g app app
-
-# create the appropriate directories
-ENV HOME=/home/app
-ENV APP_HOME=/home/app/web
-
-ENV DJANGO_SETTINGS_MODULE=makeeasyhmis.settings.base
-
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-
-RUN mkdir $APP_HOME/staticfiles
-RUN mkdir $APP_HOME/mediafiles
-
-# install dependencies
-RUN apt-get update && apt-get install -y libpq-dev
-COPY --from=builder /usr/src/app/wheels /wheels
-COPY --from=builder /usr/src/app/requirements.txt .
-RUN pip install --no-cache /wheels/*
-
-# copy entrypoint.sh
-COPY ./entrypoint.sh $APP_HOME
-
-# copy project
-COPY . $APP_HOME
-
-# chown all the files to the app user
-RUN chown -R app:app $APP_HOME
-
-# change to the app user
-USER app
-
-# run entrypoint.sh
-ENTRYPOINT ["/home/app/web/entrypoint.sh"]
-RUN chmod +x /home/app/web/entrypoint.sh
+FROM python:3
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+WORKDIR /code
+COPY requirements.txt /code/
+RUN pip install -r requirements.txt
+COPY . /code/

backend/announcement/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from .models import Announcement, Channel, Comment
+
+admin.site.register(Announcement)
+admin.site.register(Channel)
+admin.site.register(Comment)

backend/announcement/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AnnouncementConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'announcement'

backend/announcement/models.py

@@ -0,0 +1,36 @@
+from django.db import models
+from customuser.models import CustomUser
+
+class Channel(models.Model):
+     name = models.CharField(max_length=45)
+     photo = models.FileField(upload_to='announcements/channel/', null=True, blank=True)
+
+     def __str__(self):
+        return self.name
+
+class Announcement(models.Model):
+    title = models.CharField(max_length=45)
+    content = models.CharField(max_length=45)
+    created_by = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True) 
+    channel = models.ForeignKey(Channel, on_delete=models.CASCADE)
+    file = models.FileField(upload_to='announcements/file/', null=True, blank=True)
+
+
+    def __str__(self):
+        return self.title
+
+
+
+class Comment(models.Model):
+    title = models.CharField(max_length=45)
+    content = models.CharField(max_length=45)
+    created_by = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True) 
+    announcement = models.ForeignKey(Announcement, on_delete=models.CASCADE)
+    file = models.FileField(upload_to='announcements/comments/', null=True, blank=True)
+
+
+    def __str__(self):
+        return self.title
+

backend/announcement/serializeers.py

@@ -0,0 +1,25 @@
+from rest_framework import serializers
+from .models import (
+    Channel,
+    Announcement,
+    Comment,
+)
+
+
+class ChannelSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Channel
+        fields = '__all__'
+
+
+class AnnouncementSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Announcement
+        fields = '__all__'        
+
+
+
+class CommentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Comment
+        fields = '__all__'    

backend/announcement/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

backend/announcement/urls.py

@@ -0,0 +1,25 @@
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from django.conf.urls.static import static
+
+from django.conf import settings
+
+
+from .views import (
+    ChannelViewset,
+    AnnouncementViewset,
+    CommentViewset,
+)
+
+router = DefaultRouter()
+
+router.register(r'channels', ChannelViewset)
+router.register(r'announcements', AnnouncementViewset)
+router.register(r'comments', CommentViewset)
+
+urlpatterns = [
+    path('', include(router.urls)),
+]
+
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

backend/announcement/views.py

@@ -0,0 +1,38 @@
+from django.shortcuts import render
+from .models import (
+    Channel,
+    Announcement,
+    Comment,
+)
+
+from authperms.permissions import (
+    IsStaffUser,
+    IsDoctorUser,
+    IsLabTechUser,
+    IsNurseUser,
+    IsSystemsAdminUser
+)
+
+from rest_framework import viewsets
+
+from .serializeers import (
+      ChannelSerializer,
+      AnnouncementSerializer,
+      CommentSerializer,
+)
+
+class ChannelViewset(viewsets.ModelViewSet):
+    queryset = Channel.objects.all()
+    serializer_class = ChannelSerializer
+    permission_classes = (IsDoctorUser | IsNurseUser | IsLabTechUser,)
+
+class AnnouncementViewset(viewsets.ModelViewSet):
+        queryset = Announcement.objects.all()
+        serializer_class = AnnouncementSerializer
+        permission_classes = (IsDoctorUser | IsNurseUser | IsLabTechUser,)
+
+
+class CommentViewset(viewsets.ModelViewSet):
+        queryset = Comment.objects.all()
+        serializer_class = CommentSerializer
+        permission_classes = (IsDoctorUser | IsNurseUser | IsLabTechUser,)        

backend/authperms/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2023-12-03 08:22
+# Generated by Django 4.2.5 on 2024-01-25 20:06
 
 from django.db import migrations, models
 

backend/billing/apps.py

@@ -5,3 +5,6 @@ class BillingConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'billing'
 
+    def ready(self):
+        import billing.signals 
+

backend/billing/models.py

@@ -1,25 +1,45 @@
 from django.db import models
 from inventory.models import Item
+from patient.models import Patient
+from django.db.models import Sum
+
+
+def invoice_file_path(instance, filename):
+    return f'invoices/{instance.invoice_number}/{filename}'
 
 class Invoice(models.Model):
     STATUS_CHOICES = (
         ('pending', 'Pending'),
         ('paid', 'Paid'),
     )
+    patient = models.ForeignKey(Patient, on_delete = models.SET_NULL, null=True)
     invoice_number = models.CharField(max_length=50)
     invoice_date = models.DateField()
     invoice_amount = models.DecimalField(max_digits=10, decimal_places=2)
     status = models.CharField(
         max_length=10, choices=STATUS_CHOICES, default='pending')
     invoice_description = models.CharField(max_length=200)
-    invoice_file = models.FileField(upload_to='invoices', null=True, blank=True)
+    invoice_file = models.FileField(upload_to=invoice_file_path, null=True, blank=True)
     invoice_created_at = models.DateTimeField(auto_now_add=True)
     invoice_updated_at = models.DateTimeField(auto_now=True)
 
+    def calculate_invoice_amount(self):
+        # Sum up the total sale price of all related invoice items
+        total_amount = self.invoiceitem_set.aggregate(
+            total_amount=Sum('service__inventory__sale_price'))['total_amount'] or 0
+        self.invoice_amount = total_amount
+        self.save()
+
+
+
 class InvoiceItem(models.Model):
     invoice = models.ForeignKey(Invoice, on_delete=models.CASCADE)
-    item_name = models.CharField(max_length=100)
     service = models.ForeignKey(Item, on_delete=models.CASCADE)
-    item_price = models.DecimalField(max_digits=10, decimal_places=2)
     item_created_at = models.DateTimeField(auto_now_add=True)
-    item_updated_at = models.DateTimeField(auto_now=True)    
+    item_updated_at = models.DateTimeField(auto_now=True)
+    # quantity = models.CharField(max_length=50, null=True)  
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        # Recalculate invoice amount after saving the InvoiceItem
+        self.invoice.calculate_invoice_amount()

backend/billing/signals.py

@@ -0,0 +1,10 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from .models import Invoice
+from makeeasyhmis.celery_tasks import generate_invoice_pdf
+'''signal to fire up celery task to  to generated pdf once Invoice tale gets a new entry'''
+@receiver(post_save, sender=Invoice)
+def generate_invoice(sender, instance, created, **kwargs):
+    if created:
+        generate_invoice_pdf.delay(instance.pk)