Merge pull request #574 in RMS/api-main-service from SIT to staging

* commit '58c8ea14':
  comment userformat excel

03-full-api-redeploy.sh.template.SIT

@@ -11,6 +11,6 @@ cd /var/www/devrms.oneberrysystem.com/
 echo "================================================================";
 echo "======================BUILDING API SERVICES=====================";
 
-docker-compose -f api-main-service/docker-compose.yml up -d --build --remove-orphans
+docker-compose -f api-main-service/docker-compose.yml up -d --build
 
 echo "================================================================";

app/applicationlayer/cms/auto_email/reminder.py

@@ -29,6 +29,7 @@ class ReminderTriggerAPIView(views.APIView):
         
         list_of_emails = []
         for data in today_mail:
+            
             if data.frm_approver.is_action == True and data.form_code.status == 'Pending':
                 
                 # common details

app/applicationlayer/cms/utils_cr.py

@@ -574,7 +574,7 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
                            '')
             
             tbl.objects.filter(id=test['id']).delete()
-
+            
             # url = models.MasterAttachment.objects.get(id=test['file_upload'])
             # models.MasterAttachment.objects.filter(
             #     id=test['file_upload']).delete()

app/applicationlayer/download/accounts/views.py

@@ -28,6 +28,7 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
         data = User.objects.all()
         serializer = headers(data=data, many=True)
         serializer.is_valid(raise_exception=False)
+        print(serializer.data)
         return Response(serializer.data)
 
     column_header = {

app/applicationlayer/download/company/views.py

@@ -22,14 +22,14 @@ class CompanyDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
 
     def list(self, request, *args, **kwargs):
-
+        
         # id_number = request.user.code
 
         data = Company.objects.all()
         serializer = headers(data=data, many=True)
         serializer.is_valid(raise_exception=False)
         return Response(serializer.data)
-
+    
     column_header = {
         'titles': [
             'Name',

app/applicationlayer/management/batchupload/views.py

@@ -125,7 +125,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             attach_instruc.first().delete()
 
         directory = "uploads"
-
+        
         path = os.path.join(settings.MEDIA_ROOT, directory)
         
         if not os.path.isdir(path):
@@ -224,29 +224,29 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             'Privilege_Department_Code'
         )
         
-        if departments.count() > 0:
-            company = [departments[0]['Privilege_Company']]
-            department = [departments[0]['Privilege_Department']]
-            department_code = [departments[0]['Privilege_Department_Code']]
-        else:
-            company = "Oneberry Technologies"
-            department = "Sample Department"
-            department_code = "DEPARTMENT-20190101-0000000"
-            departments = {"Privilege_Company": ['No Department Data']}
+        # if departments.count() > 0:
+        #     company = [departments[0]['Privilege_Company']]
+        #     department = [departments[0]['Privilege_Department']]
+        #     department_code = [departments[0]['Privilege_Department_Code']]
+        # else:
+        #     company = "Oneberry Technologies"
+        #     department = "Sample Department"
+        #     department_code = "DEPARTMENT-20190101-0000000"
+        #     departments = {"Privilege_Company": ['No Department Data']}
         
         data = {
             'Username': ["ob-john"],
             'Name': ["John Doe"],
-            'Company': company,
-            'Department': department,
-            'Department_Code': department_code,
+            'Company': [departments[0]['Privilege_Company']],
+            'Department': [departments[0]['Privilege_Department']],
+            'Department_Code': [departments[0]['Privilege_Department_Code']],
             'Email': ["johndoe@gmail.com"],
             'Contact_No': ["123456"],
             'Application': ["cms,ams"],
             'Default_app': ["cms"],
-            'Privilege_Company': company,
-            'Privilege_Department': department,
-            'Privilege_Department_Code': department_code,
+            'Privilege_Company': [departments[0]['Privilege_Company']],
+            'Privilege_Department': [departments[0]['Privilege_Department']],
+            'Privilege_Department_Code': [departments[0]['Privilege_Department_Code']],
             'Create_CR': ["Yes"],
             'Create_Template': ["No"],
             'View_All_CR': ["Yes"],