Commit 43208a3b authored by Gladys Forte's avatar Gladys Forte

initial cr template api

parent 2f4006c7
......@@ -9,7 +9,7 @@ class ChangeRequestTemplatesSerializer(
class Meta:
model = models.ChangeRequestTemplateHeader
fields = '__all__'
read_only_fields = ['created', 'deleted_at']
read_only_fields = ['created', 'deleted_at', 'template_no']
class ChangeRequestTemplateApproversSerializer(
......@@ -18,7 +18,7 @@ class ChangeRequestTemplateApproversSerializer(
class Meta:
model = models.ChangeRequestTemplateApprovers
fields = '__all__'
read_only_fields = ['created', 'deleted_at']
read_only_fields = ['created', 'deleted_at', 'code']
class ChangeRequestTemplateStakeHoldersSerializer(
......@@ -27,7 +27,7 @@ class ChangeRequestTemplateStakeHoldersSerializer(
class Meta:
model = models.ChangeRequestTemplateStakeHolders
fields = '__all__'
read_only_fields = ['created', 'deleted_at']
read_only_fields = ['created', 'deleted_at', 'code']
class ChangeRequestTemplateAttachmentsSerializer(
......@@ -36,7 +36,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
class Meta:
model = models.ChangeRequestTemplateAttachments
fields = '__all__'
read_only_fields = ['created', 'deleted_at']
read_only_fields = ['created', 'deleted_at', 'code']
class ChangeRequestTemplateDetailsSerializer(
......
......@@ -43,4 +43,7 @@ class ChatConsumer(AsyncWebsocketConsumer):
# Send message to WebSocket
await self.send(text_data=json.dumps({
'message': message
}))
\ No newline at end of file
}))
......@@ -6,6 +6,7 @@ from app.applicationlayer.management.department.views import DepartmentViewSet
from app.applicationlayer.management.module.views import ModuleViewSet
# from app.applicationlayer.management.user.views import UsersManagementViewSet
from app.applicationlayer.management.notification.views import NotificationsViewset
from app.applicationlayer.management.changerequest import views as crviews
router = routers.DefaultRouter()
......@@ -17,7 +18,21 @@ router.register(r'modules', ModuleViewSet)
# router.register(r'users', UsersManagementViewSet)
router.register(r'notifications', NotificationsViewset)
router.register(r'template', crviews.ChangeRequestTemplatesViewset)
# router.register(r'template-approvers', crviews.ChangeRequestTemplateApproversViewset)
# router.register(r'template-stakeholders', crviews.ChangeRequestTemplateStakeHoldersViewset)
# router.register(r'template-attachments', crviews.ChangeRequestTemplateAttachmentsViewset)
# router.register(r'template-details', crviews.ChangeRequestTemplateDetailsViewset)
# router.register(r'form', crviews.ChangeRequestFormsViewset)
# router.register(r'form-approvers', crviews.ChangeRequestFormApproversViewset)
# router.register(r'form-stakeholders', crviews.ChangeRequestFormStakeHoldersViewset)
# router.register(r'form-attachments', crviews.ChangeRequestFormAttachmentsViewset)
# router.register(r'form-details', crviews.ChangeRequestFormDetailsViewset)
urlpatterns = (
path('', include(router.urls)),
path('template-post/', crviews.ChangeRequestTemplatePost.as_view()),
)
# Generated by Django 2.2 on 2019-09-05 15:30
import datetime
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('entities', '0006_auto_20190904_1855'),
]
operations = [
migrations.RemoveField(
model_name='changerequesttemplateapprovers',
name='action',
),
migrations.AddField(
model_name='changerequestformapprovers',
name='action',
field=models.CharField(blank=True, max_length=50, null=True),
),
migrations.AlterField(
model_name='changerequestformheader',
name='created',
field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
preserve_default=False,
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='created',
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2019, 9, 5, 15, 30, 4, 918778)),
preserve_default=False,
),
]
# Generated by Django 2.2 on 2019-09-05 16:02
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0007_auto_20190905_1530'),
]
operations = [
migrations.RemoveField(
model_name='changerequesttemplateapprovers',
name='date_sent',
),
migrations.AddField(
model_name='changerequestformapprovers',
name='date_sent',
field=models.DateTimeField(blank=True, null=True),
),
]
# Generated by Django 2.2 on 2019-09-05 16:25
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0008_auto_20190905_1602'),
]
operations = [
migrations.RemoveField(
model_name='changerequesttemplatestakeholders',
name='date_added',
),
]
# Generated by Django 2.2 on 2019-09-05 17:35
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0009_remove_changerequesttemplatestakeholders_date_added'),
]
operations = [
migrations.RenameField(
model_name='changerequestformattachments',
old_name='upload_no',
new_name='file_path',
),
migrations.RenameField(
model_name='changerequesttemplateattachments',
old_name='attachment_no',
new_name='code',
),
migrations.RenameField(
model_name='changerequesttemplateattachments',
old_name='upload_no',
new_name='file_path',
),
migrations.AlterField(
model_name='changerequestformattachments',
name='file_upload',
field=models.FileField(default=datetime.datetime(2019, 9, 5, 17, 35, 1, 41063), upload_to='uploads/'),
preserve_default=False,
),
migrations.AlterField(
model_name='changerequesttemplateattachments',
name='file_upload',
field=models.FileField(default=datetime.datetime(2019, 9, 5, 17, 35, 10, 500537), upload_to='uploads/'),
preserve_default=False,
),
]
# Generated by Django 2.2 on 2019-09-05 17:56
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0010_auto_20190905_1735'),
]
operations = [
migrations.RemoveField(
model_name='changerequestformattachments',
name='file_path',
),
migrations.RemoveField(
model_name='changerequesttemplateattachments',
name='file_path',
),
migrations.AlterField(
model_name='changerequestformattachments',
name='file_upload',
field=models.FileField(blank=True, null=True, upload_to='uploads/'),
),
migrations.AlterField(
model_name='changerequesttemplateattachments',
name='file_upload',
field=models.FileField(blank=True, null=True, upload_to='uploads/'),
),
]
......@@ -371,9 +371,7 @@ class BaseHeader(models.Model):
blank=True,
null=True)
created = models.DateTimeField(
blank=True,
null=True)
created = models.DateTimeField(auto_now_add=True)
deleted_at = models.DateTimeField(
blank=True,
......@@ -411,9 +409,6 @@ class BaseStakeholder(models.Model):
User,
on_delete=models.DO_NOTHING,
to_field='code')
date_added = models.DateTimeField(
blank=True,
null=True)
delegation = models.CharField(
max_length=255,
blank=True,
......@@ -430,10 +425,6 @@ class BaseStakeholder(models.Model):
class BaseAttachment(models.Model):
upload_no = models.CharField(
max_length=255,
blank=True,
null=True)
attachment_type = models.CharField(max_length=255)
attachment_name = models.CharField(max_length=255)
......@@ -449,8 +440,8 @@ class BaseAttachment(models.Model):
User,
on_delete=models.DO_NOTHING,
to_field='code')
file_upload = models.CharField(
max_length=255,
file_upload = models.FileField(
upload_to='uploads/',
blank=True,
null=True)
created = models.DateTimeField(
......@@ -507,10 +498,17 @@ class ChangeRequestTemplateHeader(BaseHeader):
class Meta:
db_table = 'change_request_template_headers'
def __str__(self):
return f'{self.requested_to_template_name}'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateHeader, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TEMPLATE.value, self.id)
ChangeRequestTemplateHeader.objects.filter(id=self.id).update(template_no=code)
# ChangeRequestTemplateHeader.objects.filter(id=self.id).update(template_no=code)
if self.template_no == '':
self.template_no = code
self.save()
def delete(self):
self.deleted_at = datetime.utcnow
......@@ -526,13 +524,6 @@ class ChangeRequestTemplateApprovers(BaseApprover):
on_delete=models.DO_NOTHING,
to_field='template_no',
related_name='tmp_approvers')
date_sent = models.DateTimeField(
blank=True,
null=True)
action = models.CharField(
max_length=50,
blank=True,
null=True)
class Meta:
db_table = 'change_request_template_approvers'
......@@ -540,10 +531,12 @@ class ChangeRequestTemplateApprovers(BaseApprover):
def save(self, *args, **kwargs):
super(ChangeRequestTemplateApprovers, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_APPROVER.value, self.id)
ChangeRequestTemplateApprovers.objects.filter(id=self.id).update(code=code)
pass
# ChangeRequestTemplateApprovers.objects.filter(id=self.id).update(code=code)
if self.code == '':
self.code = code
self.created = datetime.now()
self.save()
class ChangeRequestTemplateStakeHolders(BaseStakeholder):
code = models.CharField(
......@@ -554,20 +547,23 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
on_delete=models.DO_NOTHING,
to_field='template_no',
related_name='tmp_stakes')
class Meta:
db_table = 'change_request_template_stakeholders'
def save(self, *args, **kwargs):
super(ChangeRequestTemplateStakeHolders, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_STAKE.value, self.id)
ChangeRequestTemplateStakeHolders.objects.filter(id=self.id).update(code=code)
# ChangeRequestTemplateStakeHolders.objects.filter(id=self.id).update(code=code)
pass
if self.code == '':
self.code = code
self.created = datetime.now()
self.save()
class ChangeRequestTemplateAttachments(BaseAttachment):
attachment_no = models.CharField(
code = models.CharField(
max_length=255,
unique=True)
template_no = models.ForeignKey(
......@@ -582,9 +578,12 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
def save(self, *args, **kwargs):
super(ChangeRequestTemplateAttachments, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_ATTACH.value, self.id)
ChangeRequestTemplateAttachments.objects.filter(id=self.id).update(attachment_no=code)
# ChangeRequestTemplateAttachments.objects.filter(id=self.id).update(attachment_no=code)
pass
if self.code == '':
self.code = code
self.created = datetime.now()
self.save()
class ChangeRequestTemplateDetails(BaseDetails):
......@@ -603,9 +602,12 @@ class ChangeRequestTemplateDetails(BaseDetails):
def save(self, *args, **kwargs):
super(ChangeRequestTemplateDetails, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.TMP_DETAIL.value, self.id)
ChangeRequestTemplateDetails.objects.filter(id=self.id).update(code=code)
# ChangeRequestTemplateDetails.objects.filter(id=self.id).update(code=code)
pass
if self.code == '':
self.code = code
self.created = datetime.now()
self.save()
'''
*****
......@@ -675,6 +677,13 @@ class ChangeRequestFormApprovers(BaseApprover):
max_length=255,
null=True,
blank=True)
action = models.CharField(
max_length=50,
blank=True,
null=True)
date_sent = models.DateTimeField(
blank=True,
null=True)
class Meta:
db_table = 'change_request_form_approvers'
......@@ -717,6 +726,9 @@ class ChangeRequestFormStakeHolders(BaseStakeholder):
on_delete=models.DO_NOTHING,
to_field='form_code',
related_name='frm_stakes')
date_added = models.DateTimeField(
blank=True,
null=True)
class Meta:
db_table = 'change_request_form_stakeholders'
......
......@@ -28,4 +28,6 @@ urlpatterns = [
url(r'^chat/$', notifview.index, name='index'),
url(r'^chat/(?P<room_name>[^/]+)/$', notifview.room, name='room'),
]
This diff is collapsed.
......@@ -6,9 +6,11 @@ async-timeout==3.0.1
attrs==19.1.0
autobahn==19.9.2
Automat==0.7.0
certifi==2019.6.16
cffi==1.12.3
channels==2.2.0
channels-redis==2.4.0
chardet==3.0.4
colorama==0.4.1
constantly==15.1.0
cryptography==2.7
......@@ -35,11 +37,13 @@ pycparser==2.19
PyHamcrest==1.9.0
pylint==2.3.1
pytz==2018.9
requests==2.22.0
six==1.12.0
sqlparse==0.3.0
Twisted==19.7.0
txaio==18.8.1
typed-ast==1.3.1
urllib3==1.25.3
websocket==0.2.1
websocket-client==0.54.0
wrapt==1.11.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