Skip to content

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

Merge branch 'prod-dev-gladys' into 'feature/RMS.v2.1-AMS' 

Prod dev gladys

See merge request rms/Backend/api-main-service!977
parents 9fdb14d8 04ac49a5
Hide whitespace changes
Inline Side-by-side
Showing with 697 additions and 374 deletions
app/applicationlayer/ams/asset_group/serializers.py
View file @ 91313d42
...@@ -6,6 +6,6 @@ from app.applicationlayer.utils import model_to_dict ...@@ -6,6 +6,6 @@ from app.applicationlayer.utils import model_to_dict
class AssetGroupSerializer(serializers.ModelSerializer): class AssetGroupSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = models.AssetGroup model = models.AMSAssetGroup
fields = '__all__' fields = '__all__'
read_only_fields = ['created', 'code'] read_only_fields = ['created', 'code']
\ No newline at end of file
app/applicationlayer/ams/asset_group/table_filters.py
View file @ 91313d42
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import AssetGroup from app.entities.models import AMSAssetGroup
class AssetGroupFilter(filters.FilterSet): class AssetGroupFilter(filters.FilterSet):
class Meta: class Meta:
model = AssetGroup model = AMSAssetGroup
fields = '__all__' fields = '__all__'
\ No newline at end of file
app/applicationlayer/ams/asset_group/views.py
View file @ 91313d42
...@@ -15,14 +15,14 @@ from django.db import transaction ...@@ -15,14 +15,14 @@ from django.db import transaction
class AssetGroupViewset(viewsets.ModelViewSet): class AssetGroupViewset(viewsets.ModelViewSet):
queryset = models.AssetGroup.objects.all() queryset = models.AMSAssetGroup.objects.all()
serializer_class = serializers.AssetGroupSerializer serializer_class = serializers.AssetGroupSerializer
pagination_class = CustomPagination pagination_class = CustomPagination
lookup_field = "code" lookup_field = "code"
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter) filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
ordering_fields = '__all__' ordering_fields = '__all__'
search_fields = ( search_fields = (
'code', 'name', 'asset_group' 'code', 'name'
) )
@transaction.atomic @transaction.atomic
......
app/applicationlayer/ams/asset_type/serializers.py 0 → 100644
View file @ 91313d42
from app.entities import models
from rest_framework import serializers
from app.applicationlayer.utils import model_to_dict
class AssetTypeSerializer(serializers.ModelSerializer):
class Meta:
model = models.AMSAssetType
fields = '__all__'
read_only_fields = ['created', 'code']
\ No newline at end of file
app/applicationlayer/ams/asset_type/table_filters.py 0 → 100644
View file @ 91313d42
from django_filters import rest_framework as filters
from app.entities.models import AMSAssetType
class AssetTypeFilter(filters.FilterSet):
class Meta:
model = AMSAssetType
fields = '__all__'
\ No newline at end of file
app/applicationlayer/ams/asset_type/views.py 0 → 100644
View file @ 91313d42
from app.entities import models
from rest_framework import viewsets, status
from rest_framework.response import Response
from django_filters import rest_framework as filters
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework.filters import SearchFilter, OrderingFilter
from app.applicationlayer.ams.asset_type.table_filters import AssetTypeFilter
from app.applicationlayer.ams.asset_type import serializers
from app.applicationlayer.utils import (
CustomPagination, status_message_response
)
from app.helper import decorators
from django.db import transaction
class AssetTypeViewset(viewsets.ModelViewSet):
queryset = models.AMSAssetType.objects.all()
serializer_class = serializers.AssetTypeSerializer
pagination_class = CustomPagination
lookup_field = "code"
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
ordering_fields = '__all__'
search_fields = (
'code', 'name'
)
@transaction.atomic
def create(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
self.perform_create(serializer)
message = status_message_response(
201, 'success',
'New Asset Type created', serializer.data
)
return Response(
message
)
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset())
page = self.paginate_queryset(queryset)
if page is not None:
serializer = self.get_serializer(page, many=True)
message = status_message_response(
200,
'success',
'List of Asset Types found!',
serializer.data
)
return self.get_paginated_response(message)
serializer = self.get_serializer(self.queryset, many=True)
return Response(
serializer.data,
status=status.HTTP_200_OK
)
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
@transaction.atomic
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
self.perform_destroy(instance)
return Response(status=status.HTTP_204_NO_CONTENT)
app/applicationlayer/ams/urls_ams.py
View file @ 91313d42
...@@ -6,10 +6,12 @@ from rest_framework.urlpatterns import format_suffix_patterns ...@@ -6,10 +6,12 @@ from rest_framework.urlpatterns import format_suffix_patterns
from app.applicationlayer.ams.asset_group import views as assetgroup from app.applicationlayer.ams.asset_group import views as assetgroup
from app.applicationlayer.ams.ams_privilege import views as amsprivilege from app.applicationlayer.ams.ams_privilege import views as amsprivilege
from app.applicationlayer.ams.ams_user_type.views import AMSUserTypeViewSet from app.applicationlayer.ams.ams_user_type.views import AMSUserTypeViewSet
from app.applicationlayer.ams.asset_type import views as assettype
router = routers.DefaultRouter() router = routers.DefaultRouter()
router.register(r'asset-group', assetgroup.AssetGroupViewset) router.register(r'asset-group', assetgroup.AssetGroupViewset)
router.register(r'asset-type', assettype.AssetTypeViewset)
router.register(r'ams-privilege', amsprivilege.AMSPrivilegeViewSet) router.register(r'ams-privilege', amsprivilege.AMSPrivilegeViewSet)
urlpatterns = [ urlpatterns = [
......
app/entities/migrations/0006_auto_20200316_1813.py 0 → 100644
View file @ 91313d42
# Generated by Django 2.2 on 2020-03-16 18:13
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entities', '0005_amsprivilege'),
]
operations = [
migrations.CreateModel(
name='AMSAsset',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('description', models.CharField(blank=True, max_length=255, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
],
options={
'db_table': 'ams_assets',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSAssetGroup',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_group_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_asset_groups',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSAssetStock',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('unique_identifier', models.CharField(max_length=255, unique=True)),
('status', models.CharField(choices=[('In-Store', 'In-Store'), ('Deployed', 'Deployed'), ('Returned', 'Returned'), ('Written Off', 'Written Off'), ('Faulty', 'Faulty')], default='In-Store', max_length=100)),
('acquisition_type', models.CharField(choices=[('Owned', 'Owned'), ('Loan', 'Loan')], default='Owned', max_length=100)),
('location', models.CharField(max_length=255)),
('dynamic_field', models.TextField(blank=True, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAsset', to_field='code')),
('asset_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAssetGroup', to_field='code')),
('manager', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_manager', to=settings.AUTH_USER_MODEL, to_field='code')),
('user_client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_user_client', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_asset_stocks',
'ordering': ['-created'],
},
),
migrations.AlterField(
model_name='amsprivilege',
name='ams_user_type',
field=models.CharField(choices=[('MANAGER', 'MANAGER'), ('USER_CLIENT', 'USER_CLIENT'), ('SUPPORT', 'SUPPORT'), ('VIEWER', 'VIEWER')], default='MANAGER', max_length=100),
),
migrations.AlterField(
model_name='extracttransformload',
name='model_type',
field=models.CharField(choices=[('APP', 'APP'), ('MODULE', 'MODULE'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('USER', 'USER'), ('DELEGATION', 'DELEGATION'), ('NOTIF', 'NOTIF'), ('TMP', 'TMP'), ('TMPAPR', 'TMPAPR'), ('TMPSTK', 'TMPSTK'), ('TMPATCH', 'TMPATCH'), ('TMPDETAIL', 'TMPDETAIL'), ('FRM', 'FRM'), ('FRMAPR', 'FRMAPR'), ('FRMSTK', 'FRMSTK'), ('FRMATCH', 'FRMATCH'), ('FRMDETAIL', 'FRMDETAIL'), ('ETL', 'ETL'), ('CMSSET', 'CMSSET'), ('ASSTTYPE', 'ASSTTYPE'), ('ASST', 'ASST'), ('ASSTSTOCK', 'ASSTSTOCK'), ('ASSTGRP', 'ASSTGRP'), ('ASSTSTOCKSUP', 'ASSTSTOCKSUP'), ('RPTTYPE', 'RPTTYPE'), ('RPT', 'RPT'), ('FRMASSET', 'FRMASSET')], default='USER', max_length=100),
),
migrations.CreateModel(
name='ChangeRequestFormAssets',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('asset_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAssetStock', to_field='code')),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cms_form_assets_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
('form_code', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='change_request_form_assets', to='entities.ChangeRequestFormHeader', to_field='form_code')),
],
options={
'db_table': 'change_request_form_assets',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSReportType',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('description', models.CharField(blank=True, max_length=255, null=True)),
('dynamic_field', models.TextField(blank=True, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_report_type_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_report_types',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSReport',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('dynamic_field', models.TextField(blank=True, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('asset_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAssetStock', to_field='code')),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_report_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
('report_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSReportType', to_field='code')),
],
options={
'db_table': 'ams_reports',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSAuditTrail',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('description', models.CharField(blank=True, max_length=255, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('asset_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAssetStock', to_field='code')),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_audit_trail_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_audit_trail',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSAssetType',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('dynamic_field', models.TextField(blank=True, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_type_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_asset_types',
'ordering': ['-created'],
},
),
migrations.CreateModel(
name='AMSAssetStockSupport',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(max_length=255, unique=True)),
('name', models.CharField(max_length=255, unique=True)),
('start_date', models.DateTimeField(blank=True, null=True)),
('end_date', models.DateTimeField(blank=True, null=True)),
('created', models.DateTimeField(auto_now_add=True)),
('deleted_at', models.DateTimeField(blank=True, null=True)),
('asset_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='entities.AMSAssetStock', to_field='code')),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_stock_created_by', to=settings.AUTH_USER_MODEL, to_field='code')),
],
options={
'db_table': 'ams_asset_stock_supports',
'ordering': ['-created'],
},
),
migrations.AddField(
model_name='amsasset',
name='asset_type',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_type', to='entities.AMSAssetType', to_field='code'),
),
migrations.AddField(
model_name='amsasset',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_created_by', to=settings.AUTH_USER_MODEL, to_field='code'),
),
]
app/entities/models.py
View file @ 91313d42
...@@ -1303,402 +1303,402 @@ class AMSPrivilege(models.Model): ...@@ -1303,402 +1303,402 @@ class AMSPrivilege(models.Model):
unique_together = ['department', 'id_number'] unique_together = ['department', 'id_number']
# class AMSAssetGroup(models.Model): class AMSAssetGroup(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_group_created_by' related_name='ams_asset_group_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_asset_groups' db_table = 'ams_asset_groups'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSAssetGroup, self).save(*args, **kwargs) super(AMSAssetGroup, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.ASSET_GROUP.value, self.id) code = number_generator(enums.GenerateCode.ASSET_GROUP.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSAssetType(models.Model): class AMSAssetType(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# dynamic_field = models.TextField( dynamic_field = models.TextField(
# blank=True, blank=True,
# null=True null=True
# ) )
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_type_created_by' related_name='ams_asset_type_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_asset_types' db_table = 'ams_asset_types'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSAssetType, self).save(*args, **kwargs) super(AMSAssetType, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.ASSET_TYPE.value, self.id) code = number_generator(enums.GenerateCode.ASSET_TYPE.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSAsset(models.Model): class AMSAsset(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# asset_type = models.ForeignKey( asset_type = models.ForeignKey(
# AMSAssetType, AMSAssetType,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_type' related_name='ams_asset_type'
# ) )
# description = models.CharField( description = models.CharField(
# blank=True, blank=True,
# null=True, null=True,
# max_length=255) max_length=255)
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_created_by' related_name='ams_asset_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_assets' db_table = 'ams_assets'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSAsset, self).save(*args, **kwargs) super(AMSAsset, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.ASSET.value, self.id) code = number_generator(enums.GenerateCode.ASSET.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSAssetStock(models.Model): class AMSAssetStock(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# unique_identifier = models.CharField( unique_identifier = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# status = models.CharField( status = models.CharField(
# choices=[(tag.value, tag.value) for tag in enums.AMSAssetStatus], choices=[(tag.value, tag.value) for tag in enums.AMSAssetStatus],
# default=enums.AMSAssetStatus.INSTORE.value, default=enums.AMSAssetStatus.INSTORE.value,
# max_length=100 max_length=100
# ) )
# acquisition_type = models.CharField( acquisition_type = models.CharField(
# choices=[(tag.value, tag.value) for tag in enums.AMSAssetAquisitionType], choices=[(tag.value, tag.value) for tag in enums.AMSAssetAquisitionType],
# default=enums.AMSAssetAquisitionType.OWN.value, default=enums.AMSAssetAquisitionType.OWN.value,
# max_length=100 max_length=100
# ) )
# location = models.CharField( location = models.CharField(
# max_length=255 max_length=255
# ) )
# user_client = models.ForeignKey( user_client = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_user_client' related_name='ams_asset_user_client'
# ) )
# manager = models.ForeignKey( manager = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_manager' related_name='ams_asset_manager'
# ) )
# dynamic_field = models.TextField( dynamic_field = models.TextField(
# blank=True, blank=True,
# null=True null=True
# ) )
# asset = models.ForeignKey( asset = models.ForeignKey(
# AMSAsset, AMSAsset,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# asset_group = models.ForeignKey( asset_group = models.ForeignKey(
# AMSAssetGroup, AMSAssetGroup,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_asset_stocks' db_table = 'ams_asset_stocks'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSAssetStock, self).save(*args, **kwargs) super(AMSAssetStock, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.ASSET_STOCK.value, self.id) code = number_generator(enums.GenerateCode.ASSET_STOCK.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSAssetStockSupport(models.Model): class AMSAssetStockSupport(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# start_date = models.DateTimeField( start_date = models.DateTimeField(
# null=True, null=True,
# blank=True) blank=True)
# end_date = models.DateTimeField( end_date = models.DateTimeField(
# null=True, null=True,
# blank=True) blank=True)
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_asset_stock_created_by' related_name='ams_asset_stock_created_by'
# ) )
# asset_stock = models.ForeignKey( asset_stock = models.ForeignKey(
# AMSAssetStock, AMSAssetStock,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_asset_stock_supports' db_table = 'ams_asset_stock_supports'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSAssetStockSupport, self).save(*args, **kwargs) super(AMSAssetStockSupport, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.ASSET_STOCK_SUPPORT.value, self.id) code = number_generator(enums.GenerateCode.ASSET_STOCK_SUPPORT.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSReportType(models.Model): class AMSReportType(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# description = models.CharField( description = models.CharField(
# blank=True, blank=True,
# null=True, null=True,
# max_length=255) max_length=255)
# dynamic_field = models.TextField( dynamic_field = models.TextField(
# blank=True, blank=True,
# null=True null=True
# ) )
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_report_type_created_by' related_name='ams_report_type_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_report_types' db_table = 'ams_report_types'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSReportType, self).save(*args, **kwargs) super(AMSReportType, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.REPORT_TYPE.value, self.id) code = number_generator(enums.GenerateCode.REPORT_TYPE.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSReport(models.Model): class AMSReport(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# dynamic_field = models.TextField( dynamic_field = models.TextField(
# blank=True, blank=True,
# null=True null=True
# ) )
# report_type = models.ForeignKey( report_type = models.ForeignKey(
# AMSReportType, AMSReportType,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# asset_stock = models.ForeignKey( asset_stock = models.ForeignKey(
# AMSAssetStock, AMSAssetStock,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_report_created_by' related_name='ams_report_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_reports' db_table = 'ams_reports'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSReport, self).save(*args, **kwargs) super(AMSReport, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.REPORT.value, self.id) code = number_generator(enums.GenerateCode.REPORT.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class AMSAuditTrail(models.Model): class AMSAuditTrail(models.Model):
# code = models.CharField( code = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# name = models.CharField( name = models.CharField(
# unique=True, unique=True,
# max_length=255) max_length=255)
# description = models.CharField( description = models.CharField(
# blank=True, blank=True,
# null=True, null=True,
# max_length=255) max_length=255)
# asset_stock = models.ForeignKey( asset_stock = models.ForeignKey(
# AMSAssetStock, AMSAssetStock,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code' to_field='code'
# ) )
# created_by = models.ForeignKey( created_by = models.ForeignKey(
# User, User,
# on_delete=models.CASCADE, on_delete=models.CASCADE,
# to_field='code', to_field='code',
# related_name='ams_audit_trail_created_by' related_name='ams_audit_trail_created_by'
# ) )
# created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True) deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class Meta:
# db_table = 'ams_audit_trail' db_table = 'ams_audit_trail'
# ordering = ['-created'] ordering = ['-created']
# def __str__(self): def __str__(self):
# return f'{self.code}' return f'{self.code}'
# def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# super(AMSReport, self).save(*args, **kwargs) super(AMSReport, self).save(*args, **kwargs)
# code = number_generator(enums.GenerateCode.REPORT.value, self.id) code = number_generator(enums.GenerateCode.REPORT.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
# class ChangeRequestFormAssets(models.Model):
# code = models.CharField(
# unique=True,
# max_length=255)
# form_code = models.ForeignKey(
# ChangeRequestFormHeader,
# on_delete=models.PROTECT,
# to_field='form_code',
# related_name='frm_approvers')
# asset_stock = models.ForeignKey(
# AMSAssetStock,
# on_delete=models.CASCADE,
# to_field='code'
# )
# created_by = models.ForeignKey(
# AMSUser,
# on_delete=models.CASCADE,
# to_field='code',
# related_name='cms_form_assets_created_by'
# )
# created = models.DateTimeField(auto_now_add=True)
# deleted_at = models.DateTimeField(null=True, blank=True)
# class Meta: class ChangeRequestFormAssets(models.Model):
# db_table = 'change_request_form_assets' code = models.CharField(
# ordering = ['-created'] unique=True,
max_length=255)
form_code = models.ForeignKey(
ChangeRequestFormHeader,
on_delete=models.PROTECT,
to_field='form_code',
related_name='change_request_form_assets')
asset_stock = models.ForeignKey(
AMSAssetStock,
on_delete=models.CASCADE,
to_field='code'
)
created_by = models.ForeignKey(
User,
on_delete=models.CASCADE,
to_field='code',
related_name='cms_form_assets_created_by'
)
created = models.DateTimeField(auto_now_add=True)
deleted_at = models.DateTimeField(null=True, blank=True)
# def __str__(self):
# return f'{self.code}'
# def save(self, *args, **kwargs): class Meta:
# super(ChangeRequestFormAssets, self).save(*args, **kwargs) db_table = 'change_request_form_assets'
# code = number_generator(enums.GenerateCode.FORM_ASSET.value, self.id) ordering = ['-created']
def __str__(self):
return f'{self.code}'
def save(self, *args, **kwargs):
super(ChangeRequestFormAssets, self).save(*args, **kwargs)
code = number_generator(enums.GenerateCode.FORM_ASSET.value, self.id)
# if self.code == '': if self.code == '':
# self.code = code self.code = code
# self.created = datetime.now() self.created = datetime.now()
# self.save() self.save()
\ No newline at end of file \ No newline at end of file
requirements/RMSv2.postman_collection.json
View file @ 91313d42
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"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" "raw": "{\r\n\t\"application\":[\"APP-20190923-0000002\"],\r\n\t\"department\": \"DEPARTMENT-20200122-0000002\",\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/",
...@@ -832,17 +832,17 @@ ...@@ -832,17 +832,17 @@
], ],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\r\n\t\"application\":[\"APP-20190917-0000001\",\"APP-20190917-0000003\"],\r\n\t\"department\": \"DEPARTMENT-20190917-0000002\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"Ritas\",\r\n\t\"username\": \"obrit1a\",\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-0000001\"],\r\n\t\"department\": \"DEPARTMENT-20200122-0000002\",\r\n\t\"user_type\": \"OUA\",\r\n\t\"name\": \"Ritas\",\r\n\t\"username\": \"obrita\",\r\n\t\"doa\":\"\",\r\n\t\"default_app\": \"APP-20190923-0000001\",\r\n\t\"contact_no\": \"1312313\",\r\n\t\"email\": \"test@gmail.com\"\r\n}\r\n"
}, },
"url": { "url": {
"raw": "{{baseurl}}/management/users/USER-20190919-0000028/", "raw": "{{baseurl}}/management/users/USER-20200122-0000002/",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
"path": [ "path": [
"management", "management",
"users", "users",
"USER-20190919-0000028", "USER-20200122-0000002",
"" ""
] ]
} }
...@@ -3461,7 +3461,7 @@ ...@@ -3461,7 +3461,7 @@
"method": "GET", "method": "GET",
"header": [], "header": [],
"url": { "url": {
"raw": "{{baseurl}}/asset-management/ams-privilege/", "raw": "{{baseurl}}/asset-management/ams-privilege/?id_number=USER-20200311-0000007",
"host": [ "host": [
"{{baseurl}}" "{{baseurl}}"
], ],
...@@ -3469,6 +3469,12 @@ ...@@ -3469,6 +3469,12 @@
"asset-management", "asset-management",
"ams-privilege", "ams-privilege",
"" ""
],
"query": [
{
"key": "id_number",
"value": "USER-20200311-0000007"
}
] ]
} }
}, },
...@@ -3481,7 +3487,7 @@ ...@@ -3481,7 +3487,7 @@
"header": [], "header": [],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\n\t\"body_data\": [\n {\n \"id_number\": \"USER-20200122-0000002\",\n \"department\": \"DEPARTMENT-20200122-0000003\",\n \"ams_user_type\": \"MANAGER\"\n },\n {\n \"id_number\": \"USER-20200122-0000002\",\n \"department\": \"DEPARTMENT-20200122-0000002\",\n \"ams_user_type\": \"USER_CLIENT\"\n }\n ]\n}", "raw": "{\n\t\"form\": [\n {\n \"id_number\": \"USER-20200310-0000016\",\n \"department\": \"DEPARTMENT-20200218-0000003\",\n \"ams_user_type\": \"MANAGER\"\n },\n {\n \"id_number\": \"USER-20200310-0000016\",\n \"department\": \"DEPARTMENT-20200211-0000002\",\n \"ams_user_type\": \"MANAGER\"\n }\n ]\n}",
"options": { "options": {
"raw": { "raw": {
"language": "json" "language": "json"
...@@ -3636,6 +3642,32 @@ ...@@ -3636,6 +3642,32 @@
], ],
"protocolProfileBehavior": {}, "protocolProfileBehavior": {},
"_postman_isSubFolder": true "_postman_isSubFolder": true
},
{
"name": "Asset Type",
"item": [
{
"name": "List of Asset Type",
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{baseurl}}/asset-management/asset-type/",
"host": [
"{{baseurl}}"
],
"path": [
"asset-management",
"asset-type",
""
]
}
},
"response": []
}
],
"protocolProfileBehavior": {},
"_postman_isSubFolder": true
} }
], ],
"protocolProfileBehavior": {} "protocolProfileBehavior": {}
...@@ -3646,7 +3678,7 @@ ...@@ -3646,7 +3678,7 @@
"bearer": [ "bearer": [
{ {
"key": "token", "key": "token",
"value": "4a6d5d4ce95b759f2718e64878d4be38d257022b", "value": "6b7ae14960a219fb1dcc17768de07a4ccff58fe4",
"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