Merge pull request #564 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '711ecbf5':
  comment media on git ignore
  user_format

.gitignore

@@ -3,7 +3,7 @@ __pycache__/
 *.py[cod]
 *$py.class
 env.ini
-media/
+# media/
 docker-compose.yml
 Dockerfile
 

app/applicationlayer/management/batchupload/views.py

@@ -154,9 +154,10 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
     def UserInstruction(self, request, code=None):
         attach_instruc = MasterAttachment.objects.filter(attch_ref='etl_instruction')
         if attach_instruc:
-            print("deleted instruction")
+            print("instruction to be deleted?")
             attach_instruc.first().delete()
-        
+            print("instuction deleted!")
+
         outfilename = "instruction.pdf"
         outfiledir = 'media/uploads/'
         outfilepath = os.path.join(outfiledir, outfilename)

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-20191121-0000064,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000064,Yes,No,Yes,Yes
+,,,,,,,,,Please use this department code as reference,,,,,,
+,,,,,,,,,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000064,,,,
+,,,,,,,,,Jurong Town Corporation,Facilities Management,DEPARTMENT-20191121-0000062,,,,
+,,,,,,,,,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,,,,
+,,,,,,,,,Jurong Town Corporation,Warehouse Department,DEPARTMENT-20191121-0000065,,,,

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