Skip to content

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

Merge branch 'product-sit' into 'product-staging' 

Product sit

See merge request rms/Backend/api-main-service!946
parents 7bedab01 b9164b5a
Show whitespace changes
Inline Side-by-side
Showing with 216 additions and 85 deletions
app/applicationlayer/cms/allowed_company/views.py
View file @ 63ef0f05
......@@ -33,7 +33,7 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
)
def list(self, request, *args, **kwargs):
# hello again
queryset = self.filter_queryset(self.get_queryset())
page = self.paginate_queryset(queryset)
......
app/applicationlayer/cms/form/onbehalf/views.py
View file @ 63ef0f05
......@@ -7,8 +7,7 @@ from rest_framework import status, views
from django.db.models import Q
from app.applicationlayer.utils import (QuerySetHelper,
status_message_response,
send_broadcast_message)
status_message_response)
from app.businesslayer.changerequest import change_request
from app.entities import enums
......
app/applicationlayer/cms/template/header/serializers.py
View file @ 63ef0f05
......@@ -45,12 +45,26 @@ class ChangeRequestTemplatesSerializer(
"code": instance.requested_to_department.code,
"name": instance.requested_to_department.name
}
created_by_user_object = {
"id": instance.created_by_user.id,
"name": instance.created_by_user.name,
"username": instance.created_by_user.username,
"code": instance.created_by_user.code,
"email": instance.created_by_user.email,
"contact_no": instance.created_by_user.contact_no,
"company_code": instance.created_by_user.department.company.code,
"company_name": instance.created_by_user.department.company.name,
"department_code": instance.created_by_user.department.code,
"department_name": instance.created_by_user.department.name
}
ret['requested_to_user'] = requested_to_user_object
ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name
ret['point_of_contact'] = instance.requested_to_user.name
ret['created_by'] = instance.created_by_user.name
ret['created_by_user'] = created_by_user_object
return ret
......@@ -59,11 +73,11 @@ class ChangeRequestTemplatesSerializer(
ret['requested_to_company'] = "none"
ret['requested_to_department'] = "none"
ret['requested_to_user'] = "none"
ret['created_by_user'] = "none"
ret['company'] = "none"
ret['department'] = "none"
ret['point_of_contact'] = "none"
ret['created_by'] = "none"
return ret
......@@ -87,7 +101,10 @@ class ChangeRequestTemplatesSerializerList(
def to_representation(self, instance):
ret = super().to_representation(instance)
try:
current_user = self.context['request'].user.code
ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name
ret['point_of_contact'] = instance.requested_to_user.name
......@@ -96,18 +113,21 @@ class ChangeRequestTemplatesSerializerList(
template_no=instance.template_no
)
can_delete = ''
owned_template = ''
if child.count() > 0:
if instance.created_by_user.code == current_user:
owned_template = True
else:
owned_template = False
if child.count() > 0:
can_delete = False
else:
can_delete = True
ret['can_delete'] = can_delete
ret['owned_template'] = owned_template
return ret
except Exception as e:
......
app/applicationlayer/cms/template/header/views.py
View file @ 63ef0f05
......@@ -21,7 +21,8 @@ from app.applicationlayer.cms.utils_cr import (
)
from app.businesslayer.changerequest.change_request_template import (
tmp_add_edit_delete
tmp_add_edit_delete,
list_by_dept_privilege
)
from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
......@@ -68,11 +69,11 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset())
queryset = queryset.filter(created_by_user=request.user.code,
is_active=True)
self.serializer_class = ChangeRequestTemplatesSerializerList
id_number = self.request.user.code
self.queryset = list_by_dept_privilege(id_number)
queryset = self.filter_queryset(self.queryset)
page = self.paginate_queryset(queryset)
......@@ -82,7 +83,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
message = status_message_response(
200,
'success',
'List of Templates found',
'List of Change Request Template found',
serializer.data
)
......
app/applicationlayer/download/accounts/views.py
View file @ 63ef0f05
......@@ -22,7 +22,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
permission_classes = (AllowAny,)
def list(self, request, *args, **kwargs):
#comment this line
user_type = self.request.user.user_type
company = self.request.user.department.company.code
department = self.request.user.department.code
......
app/applicationlayer/management/account/serializer.py
View file @ 63ef0f05
......@@ -33,16 +33,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
applications = serializers.SerializerMethodField()
department = serializers.SerializerMethodField()
company = serializers.SerializerMethodField()
create_form = serializers.SerializerMethodField()
create_template = serializers.SerializerMethodField()
cms_privilege = serializers.SerializerMethodField()
my_successions = serializers.SerializerMethodField()
class Meta:
model = User
fields = (
'id',
'create_form',
'create_template',
'cms_privilege',
'code', 'name',
'username', 'contact_no',
'image', 'company',
......@@ -86,27 +84,38 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
}
return data
def get_create_form(self, user):
check_user = AllowedCompany.objects.filter(
def get_cms_privilege(self, user):
# test = AllowedCompany.objects.extra(
# select={
# 'create_form': "create_change_request=True",
# 'create_template': "create_change_request_template=True",
# }
# ).filter(id_number=user.code).values('create_form', "create_template")
create_form = AllowedCompany.objects.filter(
Q(id_number=user.code) &
Q(create_change_request=True)
).count()
if check_user <= 0:
permission = False
else:
permission = True
return permission
def get_create_template(self, user):
check_user = AllowedCompany.objects.filter(
create_template = AllowedCompany.objects.filter(
Q(id_number=user.code) &
Q(create_change_request_template=True)
).count()
if check_user <= 0:
permission = False
else:
permission = True
return permission
if create_form >= 1:
create_form = 1
if create_template >= 1:
create_template = 1
return {
"create_form": create_form,
"create_template": create_template
}
def get_image(self, user):
request = self.context.get('request')
......
app/applicationlayer/utils.py
View file @ 63ef0f05
......@@ -4,17 +4,36 @@ from rest_framework.response import Response
from functools import wraps
from app.entities import enums
from app.entities.models import EntityLog, Notification
from django.conf import settings
from websocket import create_connection
import json
from rest_framework import status
from rest_framework import serializers
import copy
import json
from pusher import Pusher
import os
import configparser
config = configparser.ConfigParser()
config_file = os.path.join('./', 'env.ini')
config.read(config_file)
REALTIMESERVER_IP = settings.REALTIMESERVER_IP
SSL = False if config['SETTINGS']['SSL'] == 1 else True
def rms_websocket(my_channel, my_event, msg):
pusher_client = pusher.Pusher(
app_id='957253',
key='c29a7f6579108991e79e',
secret='b3df5d55196b5fbd3eff',
cluster='ap1',
ssl=True
)
pusher_client.trigger(
my_channel, my_event, msg
)
def error_message(code, message, status, status_code):
......@@ -207,13 +226,20 @@ def notification_create(form_code, message, account_no,
)
ROOM = account_no
SENDER = sender_account_no
# SENDER = sender_account_no
if SSL != True:
send_broadcast_message(
ROOM,
SENDER,
'NEW NOTIFICATIONS'
)
else:
rms_websocket(
ROOM,
'cms-notification',
{'message': 'NEW NOTIFICATIONS'}
)
return True
......
app/businesslayer/changerequest/change_request_template.py
View file @ 63ef0f05
......@@ -218,3 +218,25 @@ def validation_vendor_unique_level(approvers):
if not approver['delegation'] == 'DELEGATION-20191119-0000002':
validate = approver['level']
return validate
def list_by_dept_privilege(user_id_number):
try:
priviledgeCrs = models.AllowedCompany.objects.filter(
Q(id_number=user_id_number) &
Q(view_all_change_request_template=True)
).values('group_pivots')
return_queryset = models.ChangeRequestTemplateHeader.objects.filter(
Q(is_active=True) &
(Q(created_by_user=user_id_number) |
Q(created_by_department__in=priviledgeCrs))
)
return return_queryset
except Exception as e:
return_queryset = None
return return_queryset
app/entities/migrations/0003_allowedcompany_view_all_change_request_template.py 0 → 100644
View file @ 63ef0f05
# Generated by Django 2.2 on 2020-02-27 17:46
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0002_auto_20200219_1525'),
]
operations = [
migrations.AddField(
model_name='allowedcompany',
name='view_all_change_request_template',
field=models.BooleanField(default=True),
),
]
app/entities/models.py
View file @ 63ef0f05
......@@ -1110,9 +1110,11 @@ class AllowedCompany(models.Model):
create_change_request_template = models.BooleanField(default=True)
view_all_change_request = models.BooleanField(default=True)
approve_cr = models.BooleanField(default=False)
view_all_change_request_template = models.BooleanField(default=True)
created_at = models.DateTimeField(auto_now_add=True)
deleted_at = models.DateTimeField(null=True, blank=True)
class Meta:
db_table = 'allowed_company'
unique_together = ['company_pivot', 'group_pivots', 'id_number']
......
config/settings/base.py
View file @ 63ef0f05
......@@ -27,7 +27,6 @@ SECRET_KEY = 'w!dkk7gc*dk#4!6ow3s1wc32%_yp$=osgybm=n0vw6k1j^sqo&'
# SECURITY WARNING: don't run with debug turned on in production!
ALLOWED_HOSTS = ['*']
CORS_ORIGIN_ALLOW_ALL = True
......
env.new_template.ini
View file @ 63ef0f05
......@@ -5,7 +5,7 @@ DATABASE_ENGINE = django.db.backends.mysql
DATABASE_NAME = rms_db
DATABASE_USER = red_database
DATABASE_PASSWORD = password123
DATABASE_HOST = 10.0.75.1
DATABASE_HOST = localhost
DATABASE_PORT = 3306
SESSION_TIMEOUT = 30
FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
......@@ -15,6 +15,12 @@ CATCH_EMAIL = gladys@tirsolutions.com
CR_LINK = http://localhost:8000/cms/change-request/form/view
REALTIMESERVER_IP = 127.0.0.1:8000
DEBUG = False
app_id = 957253
key = c29a7f6579108991e79e
secret = b3df5d55196b5fbd3eff
cluster = api
cms_notification = cms_notification
[NOTIFICATION_EMAIL]
......
env.template.ini
View file @ 63ef0f05
......@@ -78,3 +78,5 @@ VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR
REVISED_MESSAGE = has REJECTED the change request for your revision;RMS-CRREVISED
CANCEL_MESSAGE = has CANCELLED the change request;RMS-CRCANCELLED-USERTRIGGER
APPROVER_REJECT_MESSAGE = has REJECTED the change request for your approval;RMS-CRREJECTED-APPROVER
requirements/RMSv2.postman_collection.json
View file @ 63ef0f05
......@@ -802,7 +802,7 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/management/users/",
......@@ -1136,9 +1136,6 @@
{
"name": "account",
"request": {
"auth": {
"type": "noauth"
},
"method": "GET",
"header": [],
"url": {
......@@ -1607,7 +1604,7 @@
"formdata": [
{
"key": "username",
"value": "ob-rita",
"value": "superuser",
"type": "text"
},
{
......@@ -1970,7 +1967,7 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/change-request/form-post/",
......@@ -1992,7 +1989,7 @@
"method": "GET",
"header": [],
"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": [
"{{baseurl}}"
],
......@@ -2004,23 +2001,36 @@
"query": [
{
"key": "company_requested_to",
"value": "COMPANY-20191004-0000011"
"value": "COMPANY-20191004-0000011",
"disabled": true
},
{
"key": "department_requested_to",
"value": "DEPARTMENT-20191004-0000029"
"value": "DEPARTMENT-20191004-0000029",
"disabled": true
},
{
"key": "form_type",
"value": "closed"
"value": "closed",
"disabled": true
},
{
"key": "date_modified_from",
"value": "2019-10-11"
"value": "2019-10-11",
"disabled": true
},
{
"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 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/change-request/form/FRM-20200115-0000245/",
"raw": "{{baseurl}}/change-request/form/FRM-20200217-0000129/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form",
"FRM-20200115-0000245",
"FRM-20200217-0000129",
""
]
}
......@@ -2086,7 +2096,7 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/change-request/form/actions/",
......@@ -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}"
},
"url": {
"raw": "{{baseurl}}/change-request/form/FRM-20191004-0000078/submit/",
"raw": "{{baseurl}}/change-request/form/FRM-20200205-0000094/submit/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form",
"FRM-20191004-0000078",
"FRM-20200205-0000094",
"submit",
""
]
......@@ -2149,17 +2159,17 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/change-request/form/FRM-20191004-0000078/save/",
"raw": "{{baseurl}}/change-request/form/FRM-20200206-0000105/save/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form",
"FRM-20191004-0000078",
"FRM-20200206-0000105",
"save",
""
]
......@@ -2558,14 +2568,14 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/change-request/form-onbehalf/FRM-20200115-0000245/",
"raw": "{{baseurl}}/change-request/form-onbehalf/FRM-20191125-0000224/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"form-onbehalf",
"FRM-20200115-0000245",
"FRM-20191125-0000224",
""
]
}
......@@ -2600,7 +2610,7 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/change-request/template-post/",
......@@ -2622,7 +2632,7 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/change-request/template/?ordering=template_no",
"raw": "{{baseurl}}/change-request/template/",
"host": [
"{{baseurl}}"
],
......@@ -2630,12 +2640,6 @@
"change-request",
"template",
""
],
"query": [
{
"key": "ordering",
"value": "template_no"
}
]
}
},
......@@ -2647,14 +2651,14 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/change-request/template/TMP-20191025-0000032/",
"raw": "{{baseurl}}/change-request/template/TMP-20200214-0000099/",
"host": [
"{{baseurl}}"
],
"path": [
"change-request",
"template",
"TMP-20191025-0000032",
"TMP-20200214-0000099",
""
]
}
......@@ -2944,7 +2948,7 @@
],
"body": {
"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": {
"raw": "{{baseurl}}/change-request/allowed-companies/",
......@@ -3222,7 +3226,7 @@
],
"body": {
"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": {
"raw": {
"language": "json"
......@@ -3548,6 +3552,25 @@
}
},
"response": []
},
{
"name": "TRy",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/asset-management/acctdl/",
"host": [
"{{baseurl}}"
],
"path": [
"asset-management",
"acctdl",
""
]
}
},
"response": []
}
],
"protocolProfileBehavior": {},
......@@ -3562,7 +3585,7 @@
"bearer": [
{
"key": "token",
"value": "a678eb844bc34f0177d07daaef90206a86b67e03",
"value": "4c044cb536e1eab7f9d5d9bfa370ed003d9104c5",
"type": "string"
}
]
......
requirements/local.txt
View file @ 63ef0f05
......@@ -15,7 +15,7 @@ channels-redis==2.4.0
chardet==3.0.4
colorama==0.4.1
constantly==15.1.0
cryptography==2.7
cryptography==2.8
cssselect2==0.2.2
daphne==2.3.0
defusedxml==0.6.0
......@@ -40,15 +40,20 @@ Markdown==3.1
mccabe==0.6.1
msgpack==0.6.1
mysqlclient==1.4.2.post1
ndg-httpsclient==0.5.1
numpy==1.17.3
openpyxl==3.0.0
pandas==0.25.3
pep8==1.7.1
Pillow==6.0.0
pusher==2.1.4
pyasn1==0.4.8
pycodestyle==2.5.0
pycparser==2.19
PyHamcrest==1.9.0
pylint==2.3.1
PyNaCl==1.3.0
pyOpenSSL==19.1.0
PyPDF2==1.26.0
Pyphen==0.9.5
python-dateutil==2.8.1
......
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