Skip to content

R
red-ci-cd
Commit 21ce451c authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

Merge pull request #622 in RMS/api-main-service from gladys-dev2 to product-dev 

* commit 'd0d21f2c':
  object behalf user
parents 1c4c2bdb d0d21f2c
Show whitespace changes
Inline Side-by-side
Showing with 1412 additions and 451 deletions
app/applicationlayer/cms/cms_settings/serializer.py
View file @ 21ce451c
...@@ -2,8 +2,27 @@ from rest_framework import serializers ...@@ -2,8 +2,27 @@ from rest_framework import serializers
from app.entities.models import ChangeRequestSettings from app.entities.models import ChangeRequestSettings
from app.applicationlayer.utils import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestSettingsSerializer(serializers.ModelSerializer): class ChangeRequestSettingsSerializer(serializers.ModelSerializer):
def to_representation(self, instance):
ret = super().to_representation(instance)
if instance.behalf_user:
behalf_user_object = {
"id": instance.behalf_user.id,
"name": instance.behalf_user.name,
"username": instance.behalf_user.username,
"code": instance.behalf_user.code,
"email": instance.behalf_user.email,
"contact_no": instance.behalf_user.contact_no
}
ret['behalf_user'] = behalf_user_object
return ret
class Meta: class Meta:
model = ChangeRequestSettings model = ChangeRequestSettings
fields = '__all__' fields = '__all__'
......
app/applicationlayer/cms/cms_settings/views.py
View file @ 21ce451c
...@@ -32,6 +32,11 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -32,6 +32,11 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
logged_user = self.request.user.code
queryset = self.filter_queryset(
self.get_queryset().filter(active_user=logged_user)
)
queryset = self.filter_queryset(self.get_queryset()) queryset = self.filter_queryset(self.get_queryset())
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
...@@ -57,13 +62,13 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -57,13 +62,13 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
@transaction.atomic @transaction.atomic
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
try: try:
id_number = self.request.user.code logged_user = self.request.user.code
ChangeRequestSettings.objects.filter(active_user=id_number).delete() ChangeRequestSettings.objects.filter(active_user=logged_user).delete()
data_cms_settings = [] data_cms_settings = []
cms_settings = request.data['cms_settings'] cms_settings = request.data['cms_settings']
for cms_setting in cms_settings: for cms_setting in cms_settings:
cms_setting['active_user'] = id_number cms_setting['active_user'] = logged_user
data_cms_settings.append(cms_setting) data_cms_settings.append(cms_setting)
serializer = ChangeRequestSettingsSerializer( serializer = ChangeRequestSettingsSerializer(
......
app/helper/email_service/templates/RMS-ONBEHALF.html 0 → 100644
View file @ 21ce451c
<!DOCTYPE html>
<html>
<head>
<title>RMS: </title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Approval Reminder</h3><br>
<p>Dear {name},</p><br>
<p>Please be informed that a reminder has been sent to approve your change request. Please note that it will automatically be cancelled by the system if no action is taken within 30 days from the date it was submitted to the last approving officer.</p><br>
<b>Auto-Cancel Date</b><br>{auto_cancel_date}<br><br>
<b>Date Submitted to Last Approver</b><br>{date_submitted_last_approver}<br><br>
<b>Approver Pending Action</b><br>{approver_pending_action}<br><br><br>
<b>CR Number</b><br>{cr_number}<br><br>
<b>CR Name</b><br>{cr_name}<br><br>
<b>Company Requested To</b><br>{company_requestedto}<br><br>
<b>Department Requested To</b><br>{department_requestedto}<br><br>
<b>Priority Level</b><br>{priority_level}<br><br>
<b>Status</b><br>{status}<br><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
</html>
\ No newline at end of file
requirements/RMSv2.postman_collection.json
View file @ 21ce451c
This source diff could not be displayed because it is too large. You can view the blob instead.
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