Skip to content

R
red-ci-cd
Commit cfc9ca96 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

Merge pull request #524 in RMS/api-main-service from red-develop to RMSv2 

* commit '8b1785ce':
  replace error key from detail to message to fix the bug on upload users
  updating my copy
parents 1f78d80c 8b1785ce
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 133 deletions
app/applicationlayer/cms/form/header/views.py
View file @ cfc9ca96
......@@ -576,12 +576,16 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
print(attch)
for file_name in attch:
print(file_name['file_upload__url'])
a = os.path.join(settings.MEDIA_ROOT, file_name['file_upload__url'])
# full_file_name = os.path.join(my_folder, file_name['file_upload__url'])
# print(full_file_name)
if os.path.isfile(a):
print('ddd')
shutil.copy(a, my_folder)
print(a)
# print(type(a))
b = open(a, 'r')
shutil.copy(b, my_folder)
else:
print('xxx')
......
app/applicationlayer/cms/master/template/account/views.py
View file @ cfc9ca96
......@@ -4,9 +4,9 @@ from app.applicationlayer.utils import (CustomPagination,
from app.applicationlayer.management.account.serializer import ChangeRequestList
from app.entities import models
from rest_framework.response import Response
from django.db.models import Q
from django.db.models import Q, F
from rest_framework import status
from django.db.models import F
# from django.db.models import F
class UserListTemplate(APIView):
......
app/applicationlayer/management/batchupload/views.py
View file @ cfc9ca96
......@@ -288,13 +288,23 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
Q(company=user_company)
)
if not request_department:
raise ParseError(company_error)
# raise ParseError(company_error)
return Response(
{"message": department_error},
# {"message": str(e)},
status=status.HTTP_400_BAD_REQUEST
)
elif request.user.user_type == enums_department:
if keys['Department_Code'] != request.user.department.code:
raise ParseError(
department_error
return Response(
{"message": department_error},
# {"message": str(e)},
status=status.HTTP_400_BAD_REQUEST
)
# raise ParseError(
# department_error
# )
# user type authorization and user type per user
else:
......@@ -381,6 +391,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
"view_all_change_request": view_all,
"approve_cr": approve_cr
}
AllowedCompany.objects.create(**privilege_object)
except IntegrityError as e:
......
app/helper/decorators.py
View file @ cfc9ca96
......@@ -146,6 +146,7 @@ class rms:
def wrapper(self, request, *args, **kwargs):
if rms.user_type(self) == rms.enums_company or rms.user_type(self) == rms.enums_department:
id = rms.user(self).department.company.id
self.queryset = self.queryset.filter(
......
app/helper/email_service/templates/CHANGE_REQUEST_TEMPLATE.html
View file @ cfc9ca96
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1_0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Change Request Template</title>
<link rel="stylesheet" href="./styles.css">
</head>
<body>
<h1>Change Request Template</h1>
<h2>Requested To:</h2>
<div class="requested-to">
<div class="input">
<label>Company</label>
<input type="text" value="{company_name}">
</div>
<div class="input">
<label>Department</label>
<input type="text" value="{department_name}">
</div>
<div class="input">
<label>Template Name</label>
<input type="text" value="{template}">
</div>
<div class="input">
<label>Point of Contact</label>
<input type="text" value="{request_to_name_name}">
</div>
<div class="input">
<label>CR Number prefix</label>
<input type="text" value="{id}">
</div>
<div class="input">
<label>Priority</label>
<input type="text" value="{priority}">
</div>
<div class="input">
<label>Objective</label>
<input type="text" value="{objective}">
</div>
<div class="input">
<label>Lead Time Required (Number of Days)</label>
<input type="text" value="{target_date}">
</div>
<div class="input">
<label>Description</label>
<input type="text" value="{description}">
</div>
</div>
<h2>Created By:</h2>
<div class="input">
<label>Name</label>
<input type="text" value="{name}">
</div>
<div class="input">
<label>Department</label>
<input type="text" value="{department_name}">
</div>
<div class="input">
<label>Contact Number</label>
<input type="text" value="{contact_no}">
</div>
<div class="table">
<h3>Routing Table</h3>
<table>
<thead>
<th>Level</th>
<th>Company</th>
<th>Department</th>
<th>Name</th>
<th>Email</th>
<th>Contact</th>
<th>Delegation</th>
<th>Action</th>
</thead>
<tbody>
<tr>
<td>{approver_level}</td>
<td>{approver_company_name}</td>
<td>{approver_department_name}</td>
<td>{approver_name}</td>
<td>{approver_email}</td>
<td>{approver_contact_no}</td>
<td>{approver_delegation_name}</td>
<td>{approver_action}</td>
</tr>
</tbody>
</table>
<h3>Stakeholders</h3>
<table>
<thead>
<th>Company</th>
<th>Department</th>
<th>Name</th>
<th>Email</th>
<th>Contact</th>
<th>Delegation</th>
<th>Action</th>
</thead>
<tbody>
<tr>
<td>{stakeholder_company_name}</td>
<td>{stakeholder_department_name}</td>
<td>{stakeholder_name}</td>
<td>{stakeholder_email}</td>
<td>{stakeholder_contact_no}</td>
<td>{stakeholder_delegation_name}</td>
<td>{stakeholder_action}</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment