fixing

01-bitbucket-pull-repository.sh.template.SIT

+set password "t!r\$0lut10ns"
+
+cd /var/www/devrms.oneberrysystem.com/api-main-service
+spawn git pull "http://administrator@42.61.118.105:7990/scm/rms/api-main-service.git" SIT
+expect "Password for"
+send "$password\n"

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

+echo "================================================================";
+echo "======================REMOVING API SERVICES=====================";
+
+docker-compose -f api-main-service/docker-compose.yml down
+
+echo "================================================================";
+
+
+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
+
+echo "================================================================";

app/applicationlayer/management/batchupload/views.py

@@ -378,10 +378,10 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         code=privilege_department_code
                     )
 
-                    ccr = True if keys['Create_CR'] == 'Yes' else False
-                    crt = True if keys['Create_Template'] == 'Yes' else False
-                    view_all = True if keys['View_All_CR'] == 'Yes' else False
-                    approve_cr = True if keys['Approve_CR'] == 'Yes' else False
+                    ccr = True if keys['Create_CR'].lower() == 'yes' else False
+                    crt = True if keys['Create_Template'].lower() == 'yes' else False
+                    view_all = True if keys['View_All_CR'].lower() == 'yes' else False
+                    approve_cr = True if keys['Approve_CR'].lower() == 'yes' else False
 
                     privilege_object = {
                         "id_number": current_user,

full-api-redeploy.sh.template.SIT

+expect 01-bitbucket-pull-repository.sh
+sh /var/www/devrms.oneberrysystem.com/03-full-api-redeploy.sh

media/uploads/instruction.csv

+Application Abbreviation:
+Resource Management System = rms
+Change Request Management System = cms
+Asset Management System = ams
+
+Please use Application Abbreviation on default application and application columns
+
+NOTE:
+Save this file as .csv (Comma Delimited)  to be able to upload it in the system
+last active sheet

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-20191025-0000051,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191025-0000051,Yes,No,Yes,Yes
+,,,,,,,,,Please use this department code as reference,,,,,,
+,,,,,,,,,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191025-0000051,,,,
+,,,,,,,,,Jurong Town Corporationf,Product & Marketings,DEPARTMENT-20191025-0000052,,,,
+,,,,,,,,,Jurong Town Corporationf,Security,DEPARTMENT-20191025-0000050,,,,

media/uploads/user_format4.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
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000065,Yes,No,Yes,Yes
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Jurong Town Corporation,Facilities Management,DEPARTMENT-20191121-0000062,No,Yes,Yes,No
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,No,Yes,Yes,No
+ob-dos,Dos Doe,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000064,tirsamemail+dos@gmail.com,123458,"cms,ams",cms,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,No,Yes,Yes,No

media/uploads/user_format5_2.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
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000065,Yes,No,Yes,Yes
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Jurong Town Corporation,Facilities Management,DEPARTMENT-20191121-0000062,No,Yes,Yes,No
+jtc-dos,Dos Doe,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,tirsamemail+dos@gmail.com,123457,"cms,ams",cms,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,No,Yes,Yes,No
+ob-dos,Tres Doe,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000064,tirsamemail+tres@gmail.com,123458,"cms,ams",cms,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,Yes,No,Yes,No