Skip to content

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

Merge branch 'product-dev' into 'product-sit' 

Product dev

See merge request rms/Backend/api-main-service!944
parents db4f7fc1 16f26416
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 80 deletions
app/applicationlayer/cms/form/onbehalf/views.py
View file @ b9164b5a
...@@ -7,8 +7,7 @@ from rest_framework import status, views ...@@ -7,8 +7,7 @@ from rest_framework import status, views
from django.db.models import Q from django.db.models import Q
from app.applicationlayer.utils import (QuerySetHelper, from app.applicationlayer.utils import (QuerySetHelper,
status_message_response, status_message_response)
send_broadcast_message)
from app.businesslayer.changerequest import change_request from app.businesslayer.changerequest import change_request
from app.entities import enums from app.entities import enums
......
app/applicationlayer/download/accounts/views.py
View file @ b9164b5a
...@@ -22,7 +22,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet): ...@@ -22,7 +22,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
permission_classes = (AllowAny,) permission_classes = (AllowAny,)
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
user_type = self.request.user.user_type user_type = self.request.user.user_type
company = self.request.user.department.company.code company = self.request.user.department.company.code
department = self.request.user.department.code department = self.request.user.department.code
......
app/applicationlayer/management/account/serializer.py
View file @ b9164b5a
...@@ -34,13 +34,13 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -34,13 +34,13 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
department = serializers.SerializerMethodField() department = serializers.SerializerMethodField()
company = serializers.SerializerMethodField() company = serializers.SerializerMethodField()
cms_privilege = serializers.SerializerMethodField() cms_privilege = serializers.SerializerMethodField()
my_successions = serializers.SerializerMethodField()
class Meta: class Meta:
model = User model = User
fields = ( fields = (
'id', 'id',
"cms_privilege", 'cms_privilege',
'code', 'name', 'code', 'name',
'username', 'contact_no', 'username', 'contact_no',
'image', 'company', 'image', 'company',
...@@ -86,22 +86,37 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -86,22 +86,37 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
def get_cms_privilege(self, user): def get_cms_privilege(self, user):
test = AllowedCompany.objects.extra( # test = AllowedCompany.objects.extra(
select={ # select={
'create_form': "create_change_request=True", # 'create_form': "create_change_request=True",
'create_template': "create_change_request_template=True", # 'create_template': "create_change_request_template=True",
} # }
).filter(id_number=user.code).values('create_form', "create_template") # ).filter(id_number=user.code).values('create_form', "create_template")
# print(test.count())
create_form = AllowedCompany.objects.filter(
Q(id_number=user.code) &
Q(create_change_request=True)
).count()
create_template = AllowedCompany.objects.filter(
Q(id_number=user.code) &
Q(create_change_request_template=True)
).count()
if create_form >= 1:
create_form = 1
if create_template >= 1:
create_template = 1
if test.count() >= 1:
return {**test.values("create_form","create_template")[0]}
else:
return { return {
"create_form": False, "create_form": create_form,
"create_template": False "create_template": create_template
} }
def get_image(self, user): def get_image(self, user):
request = self.context.get('request') request = self.context.get('request')
......
app/applicationlayer/utils.py
View file @ b9164b5a
...@@ -4,46 +4,35 @@ from rest_framework.response import Response ...@@ -4,46 +4,35 @@ from rest_framework.response import Response
from functools import wraps from functools import wraps
from app.entities import enums from app.entities import enums
from app.entities.models import EntityLog, Notification from app.entities.models import EntityLog, Notification
from django.conf import settings from django.conf import settings
from websocket import create_connection from websocket import create_connection
import json import json
from rest_framework import status from rest_framework import status
from rest_framework import serializers from rest_framework import serializers
import copy import copy
import json import json
import pusher from pusher import Pusher
import os import os
import configparser import configparser
config = configparser.ConfigParser() config = configparser.ConfigParser()
config_file = os.path.join('./', 'env.ini') config_file = os.path.join('./', 'env.ini')
config.read(config_file) config.read(config_file)
REALTIMESERVER_IP = settings.REALTIMESERVER_IP REALTIMESERVER_IP = settings.REALTIMESERVER_IP
app_id = config['SETTINGS']['app_id'], SSL = False if config['SETTINGS']['SSL'] == 1 else True
key = config['SETTINGS']['key']
secret = config['SETTINGS']['secret']
cluster = config['SETTINGS']['cluster']
ssl = True if config['SETTINGS']['ssl'] == 1 else False
cms_notification = config['SETTINGS']['cms_notification']
def rms_websocket(my_channel, my_event, msg): def rms_websocket(my_channel, my_event, msg):
pusher_client = pusher.Pusher( pusher_client = pusher.Pusher(
app_id=app_id, app_id='957253',
key=key, key='c29a7f6579108991e79e',
secret=secret, secret='b3df5d55196b5fbd3eff',
cluster=cluster, cluster='ap1',
ssl=ssl ssl=True
) )
pusher_client.trigger( pusher_client.trigger(
my_channel, my_event, msg my_channel, my_event, msg
# 'my-channel', 'my-event', {'message': 'hello world'}
) )
...@@ -239,13 +228,7 @@ def notification_create(form_code, message, account_no, ...@@ -239,13 +228,7 @@ def notification_create(form_code, message, account_no,
ROOM = account_no ROOM = account_no
# SENDER = sender_account_no # SENDER = sender_account_no
# send_broadcast_message( if SSL != True:
# ROOM,
# SENDER,
# 'NEW NOTIFICATIONS'
# )
if ssl != 1:
send_broadcast_message( send_broadcast_message(
ROOM, ROOM,
SENDER, SENDER,
...@@ -254,7 +237,8 @@ def notification_create(form_code, message, account_no, ...@@ -254,7 +237,8 @@ def notification_create(form_code, message, account_no,
else: else:
rms_websocket( rms_websocket(
ROOM, ROOM,
'NEW NOTIFICATIONS' 'cms-notification',
{'message': 'NEW NOTIFICATIONS'}
) )
return True return True
......
requirements/RMSv2.postman_collection.json
View file @ b9164b5a
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n\t\"application\":[\"APP-20190923-0000001\"],\r\n\t\"department\": \"DEPARTMENT-20190923-0000002\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"Rita\",\r\n\t\"username\": \"obrita\",\r\n\t\"doa\":\"\",\r\n\t\"default_app\": \"APP-20190917-0000001\",\r\n\t\"contact_no\": \"1312313\",\r\n\t\"email\": \"test@gmail.com\"\r\n}\r\n" "raw": "{\r\n\t\"application\":[\"APP-20190923-0000002\"],\r\n\t\"department\": \"\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"ss\",\r\n\t\"username\": \"jtc-sereness\",\r\n\t\"doa\":\"\",\r\n\t\"default_app\": \"APP-20190923-0000002\",\r\n\t\"contact_no\": \"1312313\",\r\n\t\"email\": \"t@gmail.com\"\r\n}\r\n"
}, },
"url": { "url": {
"raw": "{{baseurl}}/management/users/", "raw": "{{baseurl}}/management/users/",
...@@ -1136,9 +1136,6 @@ ...@@ -1136,9 +1136,6 @@
{ {
"name": "account", "name": "account",
"request": { "request": {
"auth": {
"type": "noauth"
},
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
...@@ -1607,7 +1604,7 @@ ...@@ -1607,7 +1604,7 @@
"formdata": [ "formdata": [
{ {
"key": "username", "key": "username",
"value": "ob-rita", "value": "superuser",
"type": "text" "type": "text"
}, },
{ {
...@@ -1970,7 +1967,7 @@ ...@@ -1970,7 +1967,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n \"requested_to_template_name\": \"XXXXXXX\",\r\n \"requested_to_objective\": \"tesa\",\r\n \"requested_to_target_date\": \"2020-05-24T04:37:36.611000\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"test\",\r\n \"status\": \"Pending\",\r\n \"company_desc\": null,\r\n \"department_desc\": null,\r\n \"requested_desc\": null,\r\n \"requested_to_template_id\": \"test555\",\r\n \"requested_to_company\": \"COMPANY-20191025-0000017\",\r\n \"requested_to_department\": \"DEPARTMENT-20191025-0000050\",\r\n \"requested_to_user\": \"USER-20191025-0000150\",\r\n \"requested_by_user\": \"USER-20191025-0000151\",\r\n \"requested_by_department\": \"DEPARTMENT-20191025-0000050\",\r\n \"template_no\": \"TMP-20191025-0000032\",\r\n \"frm_approvers\": [\r\n \t{\r\n \"level\": 1,\r\n \"delegation\": \"Head of Department\",\r\n \"user\": \"USER-20191025-0000149\"\r\n \t}\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": []\r\n}" "raw": "{\r\n\t\"template_no\": \"TMP-20200130-0000061\",\r\n\t\"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n\t\"requested_to_department\": \"DEPARTMENT-20200122-0000003\",\r\n\t\"requested_to_user\": \"USER-20200122-0000010\",\r\n\t\"requested_to_template_name\": \"bn\",\r\n\t\"requested_to_template_id\": \"edit\",\r\n\t\"requested_to_objective\": \"\",\r\n\t\"requested_to_target_date\": \"2020-02-07T03:10:14.303Z\",\r\n\t\"requested_to_priority\": \"Normal\",\r\n\t\"description\": \"\",\r\n\t\"requested_by_user\": \"USER-20200122-0000006\",\r\n\t\"requested_by_department\": \"DEPARTMENT-20200122-0000003\",\r\n\t\"status\": \"Draft\",\r\n\t\"html_desc\": \"ss\",\r\n\t\"html_obj\": \"obj\",\r\n\t\r\n \"frm_approvers\": [\r\n\t\t{\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": null,\r\n\t\t\t\"delegation\": null,\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200130-0000384\"\r\n\t\t},\r\n\t\t{\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200122-0000004\",\r\n\t\t\t\"delegation\": null,\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200130-0000385\"\r\n\t\t},\r\n\t\t{\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200130-0000011\",\r\n\t\t\t\"delegation\": null,\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200130-0000386\"\r\n\t\t},\r\n\t\t{\r\n\t\t\t\"level\": 2,\r\n\t\t\t\"user\": \"USER-20200122-0000010\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000002\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200130-0000387\"\r\n\t\t},\r\n\t\t{\r\n\t\t\t\"level\": 3,\r\n\t\t\t\"user\": \"USER-20200122-0000006\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000001\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200130-0000388\"\r\n\t\t}\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": []\r\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/form-post/", "raw": "{{baseurl}}/change-request/form-post/",
...@@ -1992,7 +1989,7 @@ ...@@ -1992,7 +1989,7 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/change-request/form/?company_requested_to=COMPANY-20191004-0000011&department_requested_to=DEPARTMENT-20191004-0000029&form_type=closed&date_modified_from=2019-10-11&date_modified_to=2019-10-11", "raw": "{{baseurl}}/change-request/form/?status=pending&page_size=1",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
...@@ -2004,23 +2001,36 @@ ...@@ -2004,23 +2001,36 @@
"query": [ "query": [
{ {
"key": "company_requested_to", "key": "company_requested_to",
"value": "COMPANY-20191004-0000011" "value": "COMPANY-20191004-0000011",
"disabled": true
}, },
{ {
"key": "department_requested_to", "key": "department_requested_to",
"value": "DEPARTMENT-20191004-0000029" "value": "DEPARTMENT-20191004-0000029",
"disabled": true
}, },
{ {
"key": "form_type", "key": "form_type",
"value": "closed" "value": "closed",
"disabled": true
}, },
{ {
"key": "date_modified_from", "key": "date_modified_from",
"value": "2019-10-11" "value": "2019-10-11",
"disabled": true
}, },
{ {
"key": "date_modified_to", "key": "date_modified_to",
"value": "2019-10-11" "value": "2019-10-11",
"disabled": true
},
{
"key": "status",
"value": "pending"
},
{
"key": "page_size",
"value": "1"
} }
] ]
} }
...@@ -2033,14 +2043,14 @@ ...@@ -2033,14 +2043,14 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/change-request/form/FRM-20200115-0000245/", "raw": "{{baseurl}}/change-request/form/FRM-20200217-0000129/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"change-request", "change-request",
"form", "form",
"FRM-20200115-0000245", "FRM-20200217-0000129",
"" ""
] ]
} }
...@@ -2086,7 +2096,7 @@ ...@@ -2086,7 +2096,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n \"id\": 1111,\r\n \"form_code\": \"FRM-20200115-0000245\",\r\n \"delegation\": \"DELEGATION-20191119-0000003\",\r\n \"action\": \"Approved\",\r\n \"level\": \"1\",\r\n \"remarks\": \"\",\r\n \"move_to_level\": \"\"\r\n}" "raw": "{\r\n \"id\": 1,\r\n \"form_code\": \"FRM-20200122-0000001\",\r\n \"delegation\": \"DELEGATION-20191119-0000002\",\r\n \"action\": \"Approved\",\r\n \"level\": \"1\",\r\n \"remarks\": \"\",\r\n \"move_to_level\": \"\"\r\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/form/actions/", "raw": "{{baseurl}}/change-request/form/actions/",
...@@ -2120,14 +2130,14 @@ ...@@ -2120,14 +2130,14 @@
"raw": "{\r\n \"requested_to_template_name\": \"XXXXXXX\",\r\n \"requested_to_objective\": \"tesaasdaswererytyrtyrt\",\r\n \"requested_to_target_date\": \"2020-05-24T04:37:36.611000\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"test\",\r\n \"created\": \"2019-10-04T14:06:51.671702\",\r\n \"cancel_date\": null,\r\n \"company_desc\": null,\r\n \"department_desc\": null,\r\n \"requested_desc\": null,\r\n \"requested_to_template_id\": \"test555-20191004-0000014\",\r\n \"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n \"requested_to_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"requested_to_user\": \"USER-20191004-0000086\",\r\n \"requested_by_user\": \"USER-20191004-0000087\",\r\n \"requested_by_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"template_no\": \"TMP-20191004-0000044\",\r\n \"frm_approvers\": [\r\n {\r\n \"id\": 215,\r\n \"level\": 1,\r\n \"delegation\": \"Head of Department\",\r\n \"created\": \"2019-10-04T14:06:51.687700\",\r\n \"code\": \"FRMAPR-20191004-0000215\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": \"2019-10-04T14:06:51.754714\",\r\n \"user\": \"USER-20191004-0000082\",\r\n \"form_code\": \"FRM-20191004-0000078\"\r\n }\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": [],\r\n \"action_required\": \"No\"\r\n}" "raw": "{\r\n \"requested_to_template_name\": \"XXXXXXX\",\r\n \"requested_to_objective\": \"tesaasdaswererytyrtyrt\",\r\n \"requested_to_target_date\": \"2020-05-24T04:37:36.611000\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"test\",\r\n \"created\": \"2019-10-04T14:06:51.671702\",\r\n \"cancel_date\": null,\r\n \"company_desc\": null,\r\n \"department_desc\": null,\r\n \"requested_desc\": null,\r\n \"requested_to_template_id\": \"test555-20191004-0000014\",\r\n \"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n \"requested_to_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"requested_to_user\": \"USER-20191004-0000086\",\r\n \"requested_by_user\": \"USER-20191004-0000087\",\r\n \"requested_by_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"template_no\": \"TMP-20191004-0000044\",\r\n \"frm_approvers\": [\r\n {\r\n \"id\": 215,\r\n \"level\": 1,\r\n \"delegation\": \"Head of Department\",\r\n \"created\": \"2019-10-04T14:06:51.687700\",\r\n \"code\": \"FRMAPR-20191004-0000215\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": \"2019-10-04T14:06:51.754714\",\r\n \"user\": \"USER-20191004-0000082\",\r\n \"form_code\": \"FRM-20191004-0000078\"\r\n }\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": [],\r\n \"action_required\": \"No\"\r\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/form/FRM-20191004-0000078/submit/", "raw": "{{baseurl}}/change-request/form/FRM-20200205-0000094/submit/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"change-request", "change-request",
"form", "form",
"FRM-20191004-0000078", "FRM-20200205-0000094",
"submit", "submit",
"" ""
] ]
...@@ -2149,17 +2159,17 @@ ...@@ -2149,17 +2159,17 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n \"requested_to_template_name\": \"XXXXXXX\",\r\n \"requested_to_objective\": \"tesass\",\r\n \"requested_to_target_date\": \"2020-05-24T04:37:36.611000\",\r\n \"requested_to_priority\": \"Normal\",\r\n \"description\": \"test\",\r\n \"created\": \"2019-10-04T14:06:51.671702\",\r\n \"cancel_date\": null,\r\n \"company_desc\": null,\r\n \"department_desc\": null,\r\n \"requested_desc\": null,\r\n \"requested_to_template_id\": \"test555-20191004-0000014\",\r\n \"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n \"requested_to_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"requested_to_user\": \"USER-20191004-0000086\",\r\n \"requested_by_user\": \"USER-20191004-0000087\",\r\n \"requested_by_department\": \"DEPARTMENT-20191004-0000026\",\r\n \"template_no\": \"TMP-20191004-0000044\",\r\n \"frm_approvers\": [\r\n {\r\n \"id\": 215,\r\n \"level\": 1,\r\n \"delegation\": \"Head of Department\",\r\n \"created\": \"2019-10-04T14:06:51.687700\",\r\n \"code\": \"FRMAPR-20191004-0000215\",\r\n \"remarks\": null,\r\n \"action\": null,\r\n \"action_date\": null,\r\n \"date_sent\": \"2019-10-04T14:06:51.754714\",\r\n \"user\": \"USER-20191004-0000082\",\r\n \"form_code\": \"FRM-20191004-0000078\"\r\n }\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": [],\r\n \"action_required\": \"No\"\r\n}" "raw": "{\r\n\t\"template_no\": \"TMP-20200206-0000083\",\r\n\t\"requested_to_company\": \"COMPANY-20200122-0000002\",\r\n\t\"requested_to_department\": \"DEPARTMENT-20200122-0000002\",\r\n\t\"requested_to_user\": \"USER-20200122-0000002\",\r\n\t\"requested_to_template_name\": \"JTC-Template-1\",\r\n\t\"requested_to_template_id\": \"JTC-Template-1\",\r\n\t\"requested_to_objective\": \"JTC-Template-1\",\r\n\t\"requested_to_target_date\": \"2020-02-11T10:57:17.145Z\",\r\n\t\"requested_to_priority\": \"Normal\",\r\n\t\"description\": \"JTC-Template-1\",\r\n\t\"requested_by_user\": \"USER-20200130-0000011\",\r\n\t\"requested_by_department\": \"DEPARTMENT-20200122-0000003\",\r\n\t\r\n \"frm_approvers\": [\r\n {\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200122-0000003\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000003\",\r\n\t\t\t\"tmp_approver\": null\r\n },\r\n {\r\n \t\"id\": 410,\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200122-0000004\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000006\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000509\"\r\n },\r\n {\r\n \t\"id\": 411,\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200122-0000005\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000006\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000510\"\r\n },\r\n {\r\n \t\"id\": 412,\r\n\t\t\t\"level\": 1,\r\n\t\t\t\"user\": \"USER-20200122-0000006\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000004\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000511\"\r\n },\r\n {\r\n \t\"id\": 413,\r\n\t\t\t\"level\": 2,\r\n\t\t\t\"user\": \"USER-20200122-0000005\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000006\",\r\n\t\t\t\"tmp_approver\": null\r\n },\r\n {\r\n \t\"id\": 414,\r\n\t\t\t\"level\": 2,\r\n\t\t\t\"user\": \"USER-20200122-0000002\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000002\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000507\"\r\n },\r\n {\r\n \t\"id\": 415,\r\n\t\t\t\"level\": 3,\r\n\t\t\t\"user\": \"USER-20200122-0000002\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000002\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000512\"\r\n },\r\n {\r\n \t\"id\": 416,\r\n\t\t\t\"level\": 4,\r\n\t\t\t\"user\": \"USER-20200130-0000011\",\r\n\t\t\t\"delegation\": \"DELEGATION-20191119-0000001\",\r\n\t\t\t\"tmp_approver\": \"TMPAPR-20200206-0000513\"\r\n }\r\n ],\r\n \"frm_stakes\": [],\r\n \"frm_attachments\": [],\r\n \"frm_details\": []\r\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/form/FRM-20191004-0000078/save/", "raw": "{{baseurl}}/change-request/form/FRM-20200206-0000105/save/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"change-request", "change-request",
"form", "form",
"FRM-20191004-0000078", "FRM-20200206-0000105",
"save", "save",
"" ""
] ]
...@@ -2558,14 +2568,14 @@ ...@@ -2558,14 +2568,14 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/change-request/form-onbehalf/FRM-20200115-0000245/", "raw": "{{baseurl}}/change-request/form-onbehalf/FRM-20191125-0000224/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"change-request", "change-request",
"form-onbehalf", "form-onbehalf",
"FRM-20200115-0000245", "FRM-20191125-0000224",
"" ""
] ]
} }
...@@ -2600,7 +2610,7 @@ ...@@ -2600,7 +2610,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n\t\"requested_to_template_name\": \"Security Projects\",\r\n\t\"requested_to_template_id\": \"unionsq\",\r\n\t\"requested_to_objective\": \"Sample Objective\",\r\n\t\"requested_to_target_date\": \"10\",\r\n\t\"requested_to_priority\": \"Normal\",\r\n\t\"description\": \"Lorem Ipsum\",\r\n\t\"created_by_department\": \"DEPARTMENT-20190923-0000002\",\r\n\t\"created_by_user\": \"USER-20190923-0000001\",\r\n\t\"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n\t\"requested_to_department\": \"DEPARTMENT-20190923-0000002\",\r\n\t\"requested_to_user\": \"USER-20190923-0000001\",\r\n\t\r\n\t\"tmp_approvers\": [{\r\n\t\t\t\"level\": \"1\",\r\n\t\t\t\"delegation\": \"Head of Department\"\r\n\t\t}\r\n\t],\r\n\t\r\n\t\"tmp_stakes\": [{\r\n\t\t\"delegation\": \"Mandatory Stakeholder\",\r\n\t\t\"user\": \"USER-20190923-0000001\"\r\n\t}\r\n\t],\r\n\t\r\n\t\"tmp_attachments\": [{\r\n\t\t\"attachment_type\": \"hello\",\r\n\t\t\"attachment_name\": \"hello name\",\r\n\t\t\"file_name\": \"hello\",\r\n\t\t\"description\": \"hello desc\",\r\n\t\t\"file_upload\": 1,\r\n\t\t\"uploaded_by\": \"USER-20190923-0000001\"\r\n\t}\r\n\t],\r\n\t\r\n\t\"tmp_details\": [{\r\n\t\t\"field_idx\": \"ss\",\r\n\t\t\"field_ref\": \"ss\",\r\n\t\t\"field_val\": \"ss\",\r\n\t\t\"field_props\": \"ss\"\r\n\t}\r\n\t]\r\n}" "raw": "{\r\n\t\"requested_to_template_name\": \"sdsd\",\r\n\t\"requested_to_template_id\": \"sdfssdddasdaesdf\",\r\n\t\"requested_to_objective\": \"Sample Objective\",\r\n\t\"requested_to_target_date\": \"34\",\r\n\t\"requested_to_priority\": \"Normal\",\r\n\t\"description\": \"Lorem Ipsum\",\r\n\t\"created_by_department\": \"DEPARTMENT-20200122-0000002\",\r\n\t\"created_by_user\": \"USER-20190923-0000001\",\r\n\t\"requested_to_company\": \"COMPANY-20190923-0000001\",\r\n\t\"requested_to_department\": \"DEPARTMENT-20200122-0000002\",\r\n\t\"requested_to_user\": \"USER-20200122-0000002\",\r\n\t\"html_desc\": \"desc\",\r\n\t\"html_obj\": \"obj\",\r\n\t\r\n\t\"tmp_approvers\": [\r\n\t\t{\r\n \"level\": 1,\r\n \"is_default\": true,\r\n \"user\": \"USER-20200122-0000004\",\r\n \"delegation\": \"\"\r\n\t\t},\r\n\t\t{\r\n \"level\": 2,\r\n \"is_default\": true,\r\n \"user\": \"USER-20200122-0000002\",\r\n \"delegation\": \"DELEGATION-20191119-0000002\"\r\n\t\t},\r\n\t\t{\r\n \"level\": 3,\r\n \"is_default\": true,\r\n \"user\": \"USER-20190923-0000001\",\r\n \"delegation\": \"DELEGATION-20191119-0000001\"\r\n\t\t}\r\n\t],\r\n\t\r\n\t\"tmp_stakes\": [\r\n\t\t{\r\n\t\t\t\"delegation\": \"Mandatory Stakeholder\",\r\n\t\t\t\"user\": \"USER-20200122-0000004\"\r\n\t\t}\r\n\t],\r\n\t\r\n\t\"tmp_attachments\": [\r\n\t],\r\n\t\"tmp_details\": []\r\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/template-post/", "raw": "{{baseurl}}/change-request/template-post/",
...@@ -2622,7 +2632,7 @@ ...@@ -2622,7 +2632,7 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/change-request/template/?ordering=template_no", "raw": "{{baseurl}}/change-request/template/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
...@@ -2630,12 +2640,6 @@ ...@@ -2630,12 +2640,6 @@
"change-request", "change-request",
"template", "template",
"" ""
],
"query": [
{
"key": "ordering",
"value": "template_no"
}
] ]
} }
}, },
...@@ -2647,14 +2651,14 @@ ...@@ -2647,14 +2651,14 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/change-request/template/TMP-20191025-0000032/", "raw": "{{baseurl}}/change-request/template/TMP-20200214-0000099/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"change-request", "change-request",
"template", "template",
"TMP-20191025-0000032", "TMP-20200214-0000099",
"" ""
] ]
} }
...@@ -2944,7 +2948,7 @@ ...@@ -2944,7 +2948,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\n\t\"form\": [\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"id_number\": \"USER-20190917-0000001\",\n \"company_pivot\": \"COMPANY-20190917-0000001\",\n \"group_pivots\": \"DEPARTMENT-20190917-0000001\"\n },\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"id_number\": \"USER-20190917-0000001\",\n \"company_pivot\": \"COMPANY-20190917-0000002\",\n \"group_pivots\": \"DEPARTMENT-20190917-0000002\"\n }\n ]\n}" "raw": "{\n\t\"form\": [\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"approve_cr\": true,\n \"view_all_change_request_template\": true,\n \"id_number\": \"USER-20200122-0000006\",\n \"company_pivot\": \"COMPANY-20200122-0000002\",\n \"group_pivots\": \"DEPARTMENT-20200122-0000002\"\n },\n {\n \"create_change_request\": true,\n \"create_change_request_template\": true,\n \"view_all_change_request\": true,\n \"approve_cr\": true,\n \"view_all_change_request_template\": true,\n \"id_number\": \"USER-20200122-0000006\",\n \"company_pivot\": \"COMPANY-20190923-0000001\",\n \"group_pivots\": \"DEPARTMENT-20200122-0000003\"\n }\n ]\n}"
}, },
"url": { "url": {
"raw": "{{baseurl}}/change-request/allowed-companies/", "raw": "{{baseurl}}/change-request/allowed-companies/",
...@@ -3222,7 +3226,7 @@ ...@@ -3222,7 +3226,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\n\t\"cms_settings\": [\n {\n \"behalf_approved\": true,\n \"behalf_accepted\": true,\n \"behalf_rejected\": true,\n \"behalf_implemented\": true,\n \"behalf_completed\": true,\n \"behalf_user\": \"USER-20191121-0000412\"\n },\n {\n \"behalf_approved\": true,\n \"behalf_accepted\": true,\n \"behalf_rejected\": true,\n \"behalf_implemented\": true,\n \"behalf_completed\": true,\n \"behalf_user\": \"USER-20191121-0000415\"\n }\n ]\n}", "raw": "{\n\t\"cms_settings\": [\n {\n \"behalf_approved\": true,\n \"behalf_accepted\": true,\n \"behalf_rejected\": true,\n \"behalf_implemented\": true,\n \"behalf_completed\": true,\n \"behalf_user\": \"USER-20200122-0000005\"\n },\n {\n \"behalf_approved\": true,\n \"behalf_accepted\": true,\n \"behalf_rejected\": true,\n \"behalf_implemented\": true,\n \"behalf_completed\": true,\n \"behalf_user\": \"USER-20200122-0000002\"\n },\n {\n \"behalf_approved\": true,\n \"behalf_accepted\": true,\n \"behalf_rejected\": true,\n \"behalf_implemented\": true,\n \"behalf_completed\": true,\n \"behalf_user\": \"USER-20200122-0000005\"\n }\n ]\n}",
"options": { "options": {
"raw": { "raw": {
"language": "json" "language": "json"
...@@ -3548,6 +3552,25 @@ ...@@ -3548,6 +3552,25 @@
} }
}, },
"response": [] "response": []
},
{
"name": "TRy",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/asset-management/acctdl/",
"host": [
"{{baseurl}}"
],
"path": [
"asset-management",
"acctdl",
""
]
}
},
"response": []
} }
], ],
"protocolProfileBehavior": {}, "protocolProfileBehavior": {},
...@@ -3562,7 +3585,7 @@ ...@@ -3562,7 +3585,7 @@
"bearer": [ "bearer": [
{ {
"key": "token", "key": "token",
"value": "a678eb844bc34f0177d07daaef90206a86b67e03", "value": "4c044cb536e1eab7f9d5d9bfa370ed003d9104c5",
"type": "string" "type": "string"
} }
] ]
......
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