Merge branch 'prod-dev-gladys' into 'product-dev'

Prod dev gladys

See merge request rms/Backend/api-main-service!972

app/applicationlayer/management/account/views.py

@@ -17,7 +17,8 @@ from app.applicationlayer.utils import model_to_dict
 from app.entities.models import (
     User, EntityLog, PasswordReset, Application, UserImage,
     ChangeRequestFormHeader, ChangeRequestTemplateHeader,
-    AllowedCompany, Company, Department, UserHistory
+    AllowedCompany, Company, Department, UserHistory,
+    AMSPrivilege
 )
 
 from django.contrib.auth.hashers import make_password
@@ -32,6 +33,12 @@ from app.applicationlayer.utils import (
     CustomPagination, status_message_response, log_save,
     main_threading
 )
+import os
+import configparser
+
+config = configparser.ConfigParser()
+config_file = os.path.join('./', 'env.ini')
+config.read(config_file)
 
 
 class UserViewSet(viewsets.ModelViewSet):
@@ -181,7 +188,6 @@ class UserViewSet(viewsets.ModelViewSet):
         partial = kwargs.pop('partial', False)
         instance = self.get_object()
 
-
         cms_form = ChangeRequestFormHeader.objects.filter(
             Q(frm_approvers__user__code=instance.code) |
             Q(frm_stakes__user__code=instance.code) |
@@ -220,16 +226,25 @@ class UserViewSet(viewsets.ModelViewSet):
             rms = Application.objects.filter(id=1).values('code').first()
             app.append(rms['code'])
 
-        app = Application.objects.filter(
+        app_data = Application.objects.filter(
             code__in=app
         )
 
+        if not config['APPLICATION_CODE']['AMS'] in app:
+            ams_priv = AMSPrivilege.objects.filter(
+                id_number=instance.code
+            ).delete()
+        
+        if not config['APPLICATION_CODE']['CMS'] in app:
+            cms_priv = AllowedCompany.objects.filter(
+                id_number=instance.code
+            ).delete()
+        
         instance = User.objects.get(
             id=serializer.data['id']
         )
 
-
-        instance.application.set(app)
+        instance.application.set(app_data)
         new_instance = serializer.data
 
         log_save(

app/applicationlayer/management/batchupload/views.py

@@ -232,13 +232,14 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             'Create_CR': ["Yes"],
             'Create_Template': ["No"],
             'View_All_CR': ["Yes"],
+            'View_All_CR_Template': ["Yes"],
             'Approve_CR': ["Yes"]
         }
 
         cols = ['Username', 'Name', 'Company', 'Department', 'Department_Code']
         cols += ['Email', 'Contact_No', 'Application', 'Default_app']
         cols += ['Privilege_Company', 'Privilege_Department', 'Privilege_Department_Code']
-        cols += ['Create_CR', 'Create_Template', 'View_All_CR', 'Approve_CR']
+        cols += ['Create_CR', 'Create_Template', 'View_All_CR','View_All_CR_Template', 'Approve_CR']
 
         df = pd.DataFrame(data)
 
@@ -407,6 +408,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                     ccr = True if str(keys['Create_CR']).lower() == 'yes' else False
                     crt = True if str(keys['Create_Template']).lower() == 'yes' else False
                     view_all = True if str(keys['View_All_CR']).lower() == 'yes' else False
+                    view_all_template = True if str(keys['View_All_CR_Template']).lower() == 'yes' else False
                     approve_cr = True if str(keys['Approve_CR']).lower() == 'yes' else False
 
                     privilege_object = {
@@ -416,6 +418,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         "create_change_request": ccr,
                         "create_change_request_template": crt,
                         "view_all_change_request": view_all,
+                        "view_all_change_request_template": view_all_template,
                         "approve_cr": approve_cr
                     }
 

app/entities/enums.py

@@ -31,13 +31,17 @@ class GenerateCode(Enum):
     FORM_DETAIL = 'FRMDETAIL'
     ETL = 'ETL'
 
-    # ASSET_GROUP = 'AMSGRP'
     CMS_SETTINGS = "CMSSET"
 
     ASSET_TYPE = 'ASSTTYPE'
     ASSET = 'ASST'
     ASSET_STOCK = 'ASSTSTOCK'
     ASSET_GROUP = 'ASSTGRP'
+    ASSET_STOCK_SUPPORT = 'ASSTSTOCKSUP'
+    REPORT_TYPE = 'RPTTYPE'
+    REPORT = 'RPT'
+
+    FORM_ASSET = 'FRMASSET'
     
 '''
 *********

app/entities/models.py

@@ -1460,8 +1460,8 @@ class AMSPrivilege(models.Model):
 #         on_delete=models.CASCADE,
 #         to_field='code'
 #     )
-#     asset_type = models.ForeignKey(
-#         AMSAssetType,
+#     asset_group = models.ForeignKey(
+#         AMSAssetGroup,
 #         on_delete=models.CASCADE,
 #         to_field='code'
 #     )
@@ -1485,3 +1485,220 @@ class AMSPrivilege(models.Model):
 #             self.save()
 
 
+# class AMSAssetStockSupport(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     start_date = models.DateTimeField(
+#         null=True,
+#         blank=True)
+#     end_date = models.DateTimeField(
+#         null=True,
+#         blank=True)
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_stock_created_by'
+#     )
+#     asset_stock = models.ForeignKey(
+#         AMSAssetStock,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_asset_stock_supports'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSAssetStockSupport, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.ASSET_STOCK_SUPPORT.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class AMSReportType(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     description = models.CharField(
+#         blank=True,
+#         null=True,
+#         max_length=255)
+#     dynamic_field = models.TextField(
+#         blank=True,
+#         null=True
+#     )
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_report_type_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_report_types'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSReportType, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.REPORT_TYPE.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class AMSReport(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     dynamic_field = models.TextField(
+#         blank=True,
+#         null=True
+#     )
+#     report_type = models.ForeignKey(
+#         AMSReportType,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     asset_stock = models.ForeignKey(
+#         AMSAssetStock,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_report_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_reports'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSReport, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.REPORT.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class AMSAuditTrail(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     description = models.CharField(
+#         blank=True,
+#         null=True,
+#         max_length=255)
+#     asset_stock = models.ForeignKey(
+#         AMSAssetStock,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_audit_trail_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_audit_trail'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSReport, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.REPORT.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class ChangeRequestFormAssets(models.Model):
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     form_code = models.ForeignKey(
+#         ChangeRequestFormHeader,
+#         on_delete=models.PROTECT,
+#         to_field='form_code',
+#         related_name='frm_approvers')
+#     asset_stock = models.ForeignKey(
+#         AMSAssetStock,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     created_by = models.ForeignKey(
+#         AMSUser,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='cms_form_assets_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+
+
+#     class Meta:
+#         db_table = 'change_request_form_assets'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(ChangeRequestFormAssets, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.FORM_ASSET.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
\ No newline at end of file

env.new_template.ini

@@ -22,7 +22,6 @@ cluster = api
 cms_notification = cms_notification
 
 
-
 [NOTIFICATION_EMAIL]
 APPROVER_MESSAGE = has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
 REQUESTOR_MESSAGE = has APPROVED the change request;RMS-CRAPPROVED
@@ -35,3 +34,9 @@ VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR
 REVISED_MESSAGE = has REJECTED the change request for your revision;RMS-CRREVISED
 CANCEL_MESSAGE = has CANCELLED the change request;RMS-CRCANCELLED-USERTRIGGER
 APPROVER_REJECT_MESSAGE = has REJECTED the change request for your approval;RMS-CRREJECTED-APPROVER
+
+
+[APPLICATION_CODE]
+RMS = APP-20190923-0000001
+CMS = APP-20190923-0000002
+AMS = APP-20190923-0000003
\ No newline at end of file

media/uploads/user_format.csv

-Username,Name,Company,Department,Department_Code,Email,Contact_No,Application,Default_app,Privilege_Company,Privilege_Department,Privilege_Department_Code,Create_CR,Create_Template,View_All_CR,Approve_CR
-ob-john,John Doe,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,Yes,No,Yes,Yes
-,,,,,,,,,Please use this department code as reference,,,,,,
-,,,,,,,,,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,,,,
-,,,,,,,,,JTC Corporation,Security,DEPARTMENT-20200122-0000002,,,,
-,,,,,,,,,Sample Company,Facilities Management,DEPARTMENT-20200130-0000004,,,,
+Username,Name,Company,Department,Department_Code,Email,Contact_No,Application,Default_app,Privilege_Company,Privilege_Department,Privilege_Department_Code,Create_CR,Create_Template,View_All_CR,View_All_CR_Template,Approve_CR
+ob-john,John Doe,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,Yes,No,Yes,Yes,Yes
+,,,,,,,,,Please use this department code as reference,,,,,,,
+,,,,,,,,,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20200122-0000003,,,,,
+,,,,,,,,,JTC Corporation,Security,DEPARTMENT-20200122-0000002,,,,,
+,,,,,,,,,Sample Company,Facilities Management,DEPARTMENT-20200130-0000004,,,,,