Skip to content

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

Merge pull request #583 in RMS/api-main-service from SIT to staging 

* commit '882d6ab1':
  red-develop
  requirements docker install instrcution
  remove unused email template
  remove unused codes
  added comment to test if the dev env will pull the changes
parents ca4abb9d 882d6ab1
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 715 deletions
app/accesslayer/views.py
View file @ ac1c6025
...@@ -9,7 +9,7 @@ from rest_framework.authentication import TokenAuthentication ...@@ -9,7 +9,7 @@ from rest_framework.authentication import TokenAuthentication
from rest_framework.permissions import AllowAny from rest_framework.permissions import AllowAny
from django.db import transaction from django.db import transaction
from app.helper import decorators from app.helper import decorators
from app.applicationlayer.management.user.serializers import ( from app.applicationlayer.management.account.serializer import (
UserManagementRetreiveSerializer UserManagementRetreiveSerializer
) )
from app.entities.models import User, AuthToken from app.entities.models import User, AuthToken
......
app/applicationlayer/management/account/serializer.py
View file @ ac1c6025
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import User, Department, UserImage
import ast import ast
from django.contrib.auth.hashers import make_password, check_password from django.contrib.auth.hashers import make_password, check_password
import re import re
from django.contrib.auth import authenticate from django.contrib.auth import authenticate
from app.applicationlayer.utils import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities import enums
from django.db.models import Q
from app.applicationlayer.management.module.serializer import ModuleSerializer
from app.entities.models import (
User, Department, UserImage, AllowedCompany, Application, Module
)
class UserManagementRetreiveSerializer(serializers.ModelSerializer):
image = serializers.SerializerMethodField()
applications = serializers.SerializerMethodField()
department = serializers.SerializerMethodField()
company = serializers.SerializerMethodField()
create_form = serializers.SerializerMethodField()
create_template = serializers.SerializerMethodField()
class Meta:
model = User
fields = (
'id',
'create_form',
'create_template',
'code', 'name',
'username', 'contact_no',
'image', 'company',
'department', 'applications',
'email', 'default_app',
'user_type', 'is_active',
'doa',
)
# exclude = ['password', 'application', 'groups', 'user_permissions']
def get_department(self, user):
data = {
"id": user.department.id,
"code": user.department.code,
"name": user.department.name
}
return data
def get_company(self, user):
data = {
"id": user.department.company.id,
"code": user.department.company.code,
"name": user.department.company.name
}
return data
def get_create_form(self, user):
check_user = 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(
Q(id_number=user.code) &
Q(create_change_request_template=True)
).count()
if check_user <= 0:
permission = False
else:
permission = True
return permission
def get_image(self, user):
request = self.context.get('request')
primayPic = user.user_images.filter(is_primary=True).first()
if primayPic:
return request.build_absolute_uri(primayPic.image.url)
else:
return request.build_absolute_uri('/media/no-user.png')
def get_applications(self, user):
if user.user_type.upper() == enums.UserTypeEnum.USER.value:
app = user.application.exclude(id=1)
else:
rms = Application.objects.filter(id=1)
app = user.application.all()
app = app.union(app, rms)
list_app = []
for data in app.order_by('id'):
if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
mod = data.modules.all()
elif data.id == 1 and user.user_type.upper() != enums.UserTypeEnum.USER.value:
mod = Module.objects.filter(
name__icontains="user"
)
else:
mod = data.modules.all()
if user.user_type.upper() != enums.UserTypeEnum.USER.value:
user_module = Module.objects.filter(name__icontains="user")
mod = mod.union(mod, user_module)
else:
mod = mod
mod = mod.order_by("parent", "sort_id")
mod = ModuleSerializer(data=mod, many=True)
mod.is_valid()
app_body = {}
app_body['app_code'] = data.code
app_body['name'] = data.name
app_body['modules'] = mod.data
list_app.append(app_body)
return list_app
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
......
app/applicationlayer/management/account/views.py
View file @ ac1c6025
...@@ -232,194 +232,6 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -232,194 +232,6 @@ class UserViewSet(viewsets.ModelViewSet):
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
# @rms.user_create
# @action(detail=False,
# methods=['put'],
# url_path='batch-upload',
# name="upload User")
# @decorators.error_safe
# @transaction.atomic
# def BatchUpload(self, request):
# csv_file = request.FILES['file']
# df = pd.read_csv(csv_file, sep=',', skiprows=0)
# logged_user_type = request.user.user_type
# logged_user_company = request.user.department.company.name
# logged_user_department = request.user.department.name
# logged_user_email = request.user.email
# email_users = []
# for data, keys in df.iterrows():
# try:
# user_department = Department.objects.filter(
# Q(name__icontains=keys['department']) &
# Q(company__name__icontains=logged_user_company)
# ).first()
# if logged_user_type == 'CUA':
# user_department = Department.objects.filter(
# Q(name__icontains=keys['department']) &
# Q(company__name__icontains=logged_user_company)
# ).first()
# if user_department == None:
# msg = f"company is not the same with the logged user at row {data + 2}"
# return Response(
# {"message": msg},
# status=status.HTTP_400_BAD_REQUEST
# )
# elif logged_user_type == 'DUA':
# user_department = Department.objects.get(
# name__icontains=logged_user_department
# )
# elif logged_user_type == 'USR':
# return Response(
# {"message": "Logged User is not allowed"},
# status=status.HTTP_400_BAD_REQUEST
# )
# else:
# user_department = Department.objects.get(
# name__icontains=keys['department']
# )
# default_app = Application.objects.filter(
# excel_code=keys['default_app']
# ).first()
# enums_super = enums.UserTypeEnum.SUPER_USER.value
# enums_OUA = enums.UserTypeEnum.OVERALL_USER_ADMIN.value
# enums_company = enums.UserTypeEnum.COMPANY_USER_ADMIN.value
# enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
# enums_user = enums.UserTypeEnum.USER.value
# if keys['user_type'].lower() == 'super user' and logged_user_type == enums_super:
# user_type = enums.UserTypeEnum.SUPER_USER.value
# elif keys['user_type'].lower() == 'super user' and logged_user_type != enums_super:
# return Response(
# {"message": f"This user is not allowed to create super user. data error at row {data + 2}"},
# status=status.HTTP_201_CREATED
# )
# elif keys['user_type'].lower() == 'overall user admin':
# user_type = enums.UserTypeEnum.OVERALL_USER_ADMIN.value
# elif keys['user_type'].lower() == 'company user admin':
# user_type = enums.UserTypeEnum.COMPANY_USER_ADMIN.value
# elif keys['user_type'].lower() == 'department user admin':
# user_type = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
# else:
# user_type = enums.UserTypeEnum.USER.value
# users = {
# "username": keys['username'],
# "name": keys['name'],
# "department": user_department,
# "email": keys['email'],
# "contact_no": keys['contact_no'],
# "default_app": default_app,
# "user_type": user_type
# }
# current_user = User.objects.create(
# **users
# )
# password = User.objects.make_random_password(length=10)
# password_hash = make_password(password)
# current_user.password = password_hash
# current_user.save()
# app = Application.objects.filter(
# excel_code__in=keys['application'].split(',')
# )
# update_user = current_user.application.set(app)
# for instance in keys['privilege'].split(';'):
# privilege_list = instance.split(',')
# this_company = Company.objects.filter(
# name__icontains=privilege_list[0]
# ).first()
# this_department = Department.objects.filter(
# name__icontains=privilege_list[1]
# ).first()
# if privilege_list[2] == 0:
# privilege_list[2] = False
# else:
# privilege_list[2] = True
# if privilege_list[3] == 0:
# privilege_list[3] = False
# else:
# privilege_list[3] = True
# if privilege_list[4] == 0:
# privilege_list[4] = False
# else:
# privilege_list[4] = True
# current_user = User.objects.get(id=current_user.id)
# try:
# privilege_object = {
# "id_number": current_user,
# "company_pivot": this_company,
# "group_pivots": this_department,
# "create_change_request": privilege_list[2],
# "create_change_request_template": privilege_list[3],
# "view_all_change_request": privilege_list[4],
# "approve_cr": privilege_list[5]
# }
# AllowedCompany.objects.create(**privilege_object)
# except IntegrityError as e:
# return Response(
# {"message": f"Duplicate user privilege at row {data + 2}"},
# status=status.HTTP_400_BAD_REQUEST
# )
# except IntegrityError as e:
# return Response(
# {"message": f"Record already exist at row {data + 2}"},
# status=status.HTTP_400_BAD_REQUEST
# )
# except KeyError as e:
# return Response(
# {"message": "Missing column user_type"},
# status=status.HTTP_400_BAD_REQUEST
# )
# del users['department']
# del users['contact_no']
# del users['default_app']
# del users['user_type']
# users['password'] = password
# UserHistory.objects.create(
# **users
# )
# users['admin'] = logged_user_email
# send_mail = UserHistory.objects.filter(sent=False)[0:100].values(
# 'name', 'username', 'email', 'password'
# )
# df = pd.DataFrame(send_mail)
# df.to_csv("users.csv", index=False)
# args = ["users.csv", logged_user_email]
# main_threading(args, sender.batch_email_admin)
# args = [send_mail, logged_user_email]
# main_threading(args, sender.batch_email_users)
# return Response(
# {"message": "File already uploaded"},
# status=status.HTTP_201_CREATED
# )
@action(detail=True, @action(detail=True,
methods=['put'], methods=['put'],
url_path='reset-password', url_path='reset-password',
......
app/applicationlayer/management/batchupload/views.py
View file @ ac1c6025
...@@ -155,6 +155,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -155,6 +155,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
fontSize=13, fontSize=13,
leading=28, leading=28,
textColor=red)) textColor=red))
# testing for pull
items = [ items = [
"1. To be able to add multiple users in the system, you must first <u>Download the</u>", "1. To be able to add multiple users in the system, you must first <u>Download the</u>",
......
app/applicationlayer/management/user/apps.py deleted 100644 → 0
View file @ ca4abb9d
from django.apps import AppConfig
class UserManagementConfig(AppConfig):
name = 'user_management'
app/applicationlayer/management/user/serializers.py deleted 100644 → 0
View file @ ca4abb9d
from rest_framework import serializers
from app.applicationlayer import serializers as app_serializers
from app.entities import models
from django.db.models import Q
from app.applicationlayer.management.module.serializer import ModuleSerializer
from app.entities import enums
# Used for Create and Update
class UserManagementSerializer(serializers.ModelSerializer):
image = serializers.SerializerMethodField()
class Meta:
model = models.User
exclude = ['password']
def get_image(self, user):
request = self.context.get('request')
primayPic = user.user_images.filter(is_primary=True).first()
if primayPic:
return request.build_absolute_uri(primayPic.image.url)
else:
return request.build_absolute_uri('/media/no-user.png')
# Used for Retrieve and List
class UserManagementRoleSerializer(serializers.ModelSerializer):
permissions = serializers.SlugRelatedField(many=True,
read_only=True,
slug_field='code')
class Meta:
model = models.Role
fields = '__all__'
read_only_fields = ['createdby', 'modifiedby', 'created', 'modified']
# Used for Retrieve and List
class UserManagementRetreiveSerializer(serializers.ModelSerializer):
image = serializers.SerializerMethodField()
applications = serializers.SerializerMethodField()
department = serializers.SerializerMethodField()
company = serializers.SerializerMethodField()
create_form = serializers.SerializerMethodField()
create_template = serializers.SerializerMethodField()
class Meta:
model = models.User
fields = (
'id',
'create_form',
'create_template',
'code', 'name',
'username', 'contact_no',
'image', 'company',
'department', 'applications',
'email', 'default_app',
'user_type', 'is_active',
'doa',
)
# exclude = ['password', 'application', 'groups', 'user_permissions']
def get_department(self, user):
data = {
"id": user.department.id,
"code": user.department.code,
"name": user.department.name
}
return data
def get_company(self, user):
data = {
"id": user.department.company.id,
"code": user.department.company.code,
"name": user.department.company.name
}
return data
def get_create_form(self, user):
check_user = models.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 = models.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
def get_image(self, user):
request = self.context.get('request')
primayPic = user.user_images.filter(is_primary=True).first()
if primayPic:
return request.build_absolute_uri(primayPic.image.url)
else:
return request.build_absolute_uri('/media/no-user.png')
def get_applications(self, user):
if user.user_type.upper() == enums.UserTypeEnum.USER.value:
app = user.application.exclude(id=1)
else:
rms = models.Application.objects.filter(id=1)
app = user.application.all()
app = app.union(app, rms)
list_app = []
for data in app.order_by('id'):
if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
mod = data.modules.all()
elif data.id == 1 and user.user_type.upper() != enums.UserTypeEnum.USER.value:
mod = models.Module.objects.filter(
name__icontains="user"
)
else:
mod = data.modules.all()
if user.user_type.upper() != enums.UserTypeEnum.USER.value:
user_module = models.Module.objects.filter(name__icontains="user")
mod = mod.union(mod, user_module)
else:
mod = mod
mod = mod.order_by("parent", "sort_id")
mod = ModuleSerializer(data=mod, many=True)
mod.is_valid()
app_body = {}
app_body['app_code'] = data.code
app_body['name'] = data.name
app_body['modules'] = mod.data
list_app.append(app_body)
return list_app
class ChangePasswordSerializer(serializers.Serializer):
old_password = serializers.CharField(max_length=100, required=True)
new_password = serializers.CharField(max_length=100, required=True)
new_password_confirm = serializers.CharField(max_length=100, required=True)
class Meta:
fields = '__all__'
# class UserSpecialPermissionSerializer(serializers.Serializer):
# special_permissions = app_serializers.PermissionSerializer(required=True,
# many=True)
# class Meta:
# fields = '__all__'
app/applicationlayer/management/user/table_filters.py deleted 100644 → 0
View file @ ca4abb9d
from django_filters import rest_framework as filters
from django.db.models import Count
from app.entities import models
from django.db.models import Q
class UserManagementFilter(filters.FilterSet):
search = filters.CharFilter(method='search_bar', label='search')
def search_bar(self, queryset, name, value):
return queryset.filter(
Q(username__icontains=value) |
Q(first_name__icontains=value) |
Q(last_name__icontains=value))
class Meta:
model = models.User
fields = '__all__'
app/applicationlayer/management/user/views.py deleted 100644 → 0
View file @ ca4abb9d
import copy
import json
from app.entities import enums
# from app.businesslayer import log_save
from app.applicationlayer.utils import model_to_dict
from django.shortcuts import render
from rest_framework.response import Response
from app.entities import models
from django.db import transaction
from app.helper import decorators
from rest_framework import viewsets, status
from rest_framework.decorators import action
from app.applicationlayer.management.user import table_filters
from django_filters.rest_framework import DjangoFilterBackend
from app.applicationlayer import paginators
from app.applicationlayer import serializers as app_serializers
from . import serializers, table_filters
from django.conf import settings
from django.contrib.auth import authenticate
from app.helper.file_manager import FileHelper
from app.applicationlayer.utils import (
CustomPagination, status_message_response, log_save, QuerySetHelper
)
from django.db.models import (Q, F, Sum, OuterRef, Subquery, Q, Case, When,
Value, Func, Count,
CharField,
IntegerField,
DecimalField,
BooleanField)
# Create your views here.
class UsersManagementViewSet(viewsets.ModelViewSet):
"""ViewSet for the Requisition"""
queryset = models.User.objects.all()
serializer_class = serializers.UserManagementSerializer
filter_backends = (DjangoFilterBackend,)
filter_class = table_filters.UserManagementFilter
pagination_class = CustomPagination
@transaction.atomic
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
new_instance = model_to_dict(instance)
instance.applications.remove()
self.perform_destroy(instance)
log_save(
enums.LogEnum.DELETED.value,
enums.LogEntitiesEnum.USER.value,
new_instance['id'],
new_instance,
''
)
return Response(status=status.HTTP_204_NO_CONTENT)
@decorators.error_safe
def list(self, request, *args, **kwargs):
self.serializer_class = serializers.UserManagementRetreiveSerializer
return super(UsersManagementViewSet, self).list(request)
@decorators.error_safe
def retrieve(self, request, *args, **kwargs):
self.serializer_class = serializers.UserManagementRetreiveSerializer
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
@decorators.error_safe
@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)
headers = self.get_success_headers(serializer.data)
pk = serializer.data['id']
createdUser = models.User.objects.filter(id=pk).first()
createdUser.set_password(settings.USER_DEFAULT_PASSWORD)
createdUser.save()
# LOG ADD
log_save.log_save(
enums.LogEnum.ADD.value,
enums.LogEntitiesEnum.USER.value,
model_to_dict(createdUser))
return Response(serializer.data,
status=status.HTTP_201_CREATED,
headers=headers)
@decorators.error_safe
@transaction.atomic
def perform_update(self, serializer):
fromObj = copy.copy(serializer.instance)
serializer.save()
toObj = copy.copy(serializer.instance)
log_save.log_save(
enums.LogEnum.UPDATE.value,
enums.LogEntitiesEnum.USER.value,
model_to_dict(fromObj),
model_to_dict(toObj))
@action(detail=True,
methods=['put'],
url_path='upload-profile-picture',
name="Uploads Profile Picture of User")
@decorators.error_safe
@transaction.atomic
def UploadProfilePicture(self, request, pk=None):
existingUser = models.User.objects.filter(id=pk).first()
if existingUser:
eximages = models.UserImage.objects.filter(user_id=pk)
if (eximages):
for item in eximages:
item.delete()
# DELETE FROM PHYSICAL
FileHelper.DeleteFile(path=item.image.path)
self.serializer_class = app_serializers.UserImageSerializer
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
self.perform_create(serializer)
headers = self.get_success_headers(serializer.data)
return Response(serializer.data,
status=status.HTTP_201_CREATED,
headers=headers)
else:
raise Exception('User not found')
return Response(data={"detail": "Success"})
@action(detail=True,
methods=['put'],
url_path='reset-password',
name="Reset Password of User")
@decorators.error_safe
@transaction.atomic
def ResetPassword(self, request, pk=None):
existingUser = models.User.objects.filter(id=pk).first()
if existingUser:
existingUser.set_password(settings.USER_DEFAULT_PASSWORD)
fromObj = copy.copy(existingUser)
existingUser.save()
toObj = copy.copy(existingUser)
log_save.log_save(
enums.LogEnum.UPDATE.value,
enums.LogEntitiesEnum.ROBOT.value,
model_to_dict(fromObj),
model_to_dict(toObj))
else:
raise Exception('User not found')
return Response(data={"detail": "Success"})
@action(detail=True,
methods=['put'],
url_path='change-password',
name="Change Password of User")
@decorators.error_safe
@transaction.atomic
def ChangePassword(self, request, pk=None):
self.serializer_class = serializers\
.ChangePasswordSerializer
serializer = self.get_serializer(data=request.data)
if serializer.is_valid():
form = copy.deepcopy(serializer.validated_data)
if form['new_password'] != form['new_password_confirm']:
raise Exception('Passwords must match')
existingUser = models.User.objects.filter(id=pk).first()
if existingUser:
user = authenticate(
username=existingUser.username,
password=form['old_password'])
if user:
existingUser.set_password(form['new_password_confirm'])
fromObj = copy.copy(existingUser)
existingUser.save()
toObj = copy.copy(existingUser)
log_save.log_save(
enums.LogEnum.UPDATE.value,
enums.LogEntitiesEnum.ROBOT.value,
model_to_dict(fromObj),
model_to_dict(toObj))
return Response(data={"detail": "Success"},
status=200)
else:
raise Exception("Invalid Old Password")
else:
raise Exception('User not found')
else:
serializer.is_valid(raise_exception=True)
return Response(data={"detail": "Error"}, status=500)
@action(detail=True,
methods=['put'],
url_path='add-special-permissions',
name="Adds special permissions to user")
@decorators.error_safe
@transaction.atomic
def UserSpecialPermissions(self, request, pk=None):
user = models.User.objects.filter(id=pk).first()
if not user:
raise Exception('User not found')
# CLEARES ALL USER'S SPECIAL PERMISSION'
for i in user.special_permissions.all():
i.delete()
user.save()
# LOAD NEW USER'S NEW SPECIAL PERMISSIONS
form = copy.deepcopy(request.data)
for spid in form['special_permissions']:
sp = models.Permission.objects.filter(id=spid).first()
if not sp:
raise Exception(F"{spid} does not exists")
return Response(data={"detail": "Success"}, status=200)
# # Lists ALL Application Permissions (No Pagination)
# @action(detail=False,
# methods=['get'],
# url_path='all-permissions',
# name="Lists all Application's Permissions")
# @decorators.error_safe
# def AllPermissions(self, request, *args, **kwargs):
# return Response(
# models.Permission.objects.values(
# permissionId=F('id'),
# permissionCode=F('code')
# )
# )
app/applicationlayer/master/urls.py
View file @ ac1c6025
...@@ -5,7 +5,6 @@ from app.applicationlayer.master.Account.views import AdminAccountViewSet ...@@ -5,7 +5,6 @@ from app.applicationlayer.master.Account.views import AdminAccountViewSet
from app.applicationlayer.master.company.views import AdminCompanyViewSet from app.applicationlayer.master.company.views import AdminCompanyViewSet
from app.applicationlayer.master.department.views import AdminDepartmentViewSet from app.applicationlayer.master.department.views import AdminDepartmentViewSet
from app.applicationlayer.master.user_type.views import UserTypeViewSet from app.applicationlayer.master.user_type.views import UserTypeViewSet
from app.applicationlayer.master.user_type.views import cronjob
from app.applicationlayer.master.attachment.views import MasterAttachmentViewSet from app.applicationlayer.master.attachment.views import MasterAttachmentViewSet
router = routers.DefaultRouter() router = routers.DefaultRouter()
...@@ -13,10 +12,8 @@ router.register(r'users', AdminAccountViewSet) ...@@ -13,10 +12,8 @@ router.register(r'users', AdminAccountViewSet)
router.register(r'companies', AdminCompanyViewSet) router.register(r'companies', AdminCompanyViewSet)
router.register(r'departments', AdminDepartmentViewSet) router.register(r'departments', AdminDepartmentViewSet)
router.register(r'attachments', MasterAttachmentViewSet) router.register(r'attachments', MasterAttachmentViewSet)
# router.register(r'user-types', UserTypeViewSet)
urlpatterns = [ urlpatterns = [
path('', include(router.urls)), path('', include(router.urls)),
url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"), url(r'^user-types/$', UserTypeViewSet.as_view(), name="user-types"),
url(r'^cronjob/$', cronjob.as_view(), name="user-types"),
] ]
\ No newline at end of file
app/applicationlayer/master/user_type/views.py
View file @ ac1c6025
...@@ -50,15 +50,4 @@ class UserTypeViewSet(APIView): ...@@ -50,15 +50,4 @@ class UserTypeViewSet(APIView):
del data['results'][str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name)] del data['results'][str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name)]
del data['results'][str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name)] del data['results'][str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name)]
return Response(data) return Response(data)
\ No newline at end of file
class cronjob(APIView):
permission_classes = (AllowAny,)
def get(self, request, format=None):
args = ''
main_threading(args, sender.cronjob)
return Response("sent")
app/helper/email_service/sender.py
View file @ ac1c6025
...@@ -13,15 +13,6 @@ from xhtml2pdf import pisa ...@@ -13,15 +13,6 @@ from xhtml2pdf import pisa
from email.mime.text import MIMEText from email.mime.text import MIMEText
def to_pdf():
F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-NEWUSER.html'), 'r')
result = BytesIO()
pdf = pisa.pisaDocument(F, result)
if not pdf.err:
return HttpResponse(result.getvalue(), content_type='application/pdf')
return None
@transaction.atomic @transaction.atomic
def batch_email_users(args): def batch_email_users(args):
connection = email_connection.get_connection() connection = email_connection.get_connection()
...@@ -124,36 +115,6 @@ def account_created(args): ...@@ -124,36 +115,6 @@ def account_created(args):
return True return True
def cronjob(args):
try:
send_mail(
subject='Resource Management System: Welcome!',
message='',
from_email=settings.EMAIL_DEFAULT_SENDER,
recipient_list=('gladys@tirsolutions.com',),
html_message="FC",
fail_silently=False
)
models.EmailLogs.objects.create(
template='RMS-NEWUSER.html',
recipients="test",
content="FC",
is_sent=True,
createdby=admin,
modifiedby=admin
)
except Exception as e:
models.EmailLogs.objects.create(
template='RMS-NEWUSER.html',
recipients="test",
content="FC",
is_sent=False,
createdby="superuser",
modifiedby="superuser"
)
return True
# direct mailer from django # direct mailer from django
def forgot_password(args): def forgot_password(args):
reset_code = args[0] reset_code = args[0]
......
app/helper/email_service/templates/cronjob.html deleted 100644 → 0
View file @ ca4abb9d
<!DOCTYPE html>
<html>
<head>
<title>RMS: Change Request Acknowledged</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Change Request Acknowledged</h3><br>
<p>cron job test,</p><br>
<p>Your change request has been acknowledged. Please see the details of your change request below.</p><br>
<p>Please click <u><a href="{url}" style="text-decoration:underline;color:#007bff;" target="_blank">here</a></u> to access the change request.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body>
</html>
\ No newline at end of file
media/uploads/user_format.csv
View file @ ac1c6025
Username,Name,Company,Department,Department_Code,Email,Contact_No,Application,Default_app,Privilege_Company,Privilege_Department,Privilege_Department_Code,Create_CR,Create_Template,View_All_CR,Approve_CR Username,Name,Company,Department,Department_Code,Email,Contact_No,Application,Default_app,Privilege_Company,Privilege_Department,Privilege_Department_Code,Create_CR,Create_Template,View_All_CR,Approve_CR
ob-john,John Doe,Oneberry Technologies,Sample Department,DEPARTMENT-20190101-0000000,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies,Sample Department,DEPARTMENT-20190101-0000000,Yes,No,Yes,Yes ob-john,John Doe,Oneberry Technologies Pte Ltd,Admin Department,DEPARTMENT-20191218-0000067,johndoe@gmail.com,123456,"cms,ams",cms,Oneberry Technologies Pte Ltd,Admin Department,DEPARTMENT-20191218-0000067,Yes,No,Yes,Yes
,,,,,,,,,Please use this department code as reference,,,,,, ,,,,,,,,,Please use this department code as reference,,,,,,
,,,,,,,,,No Department Data,,,,,, ,,,,,,,,,Oneberry Technologies Pte Ltd,Admin Department,DEPARTMENT-20191218-0000067,,,,
,,,,,,,,,Oneberry Technologies Pte Ltd,Business Development,DEPARTMENT-20191121-0000064,,,,
,,,,,,,,,Oneberry Technologies Pte Ltd,IT Department,DEPARTMENT-20191219-0000069,,,,
,,,,,,,,,Jurong Town Corporation,Facilities Management,DEPARTMENT-20191121-0000062,,,,
,,,,,,,,,Jurong Town Corporation,Sample Department,DEPARTMENT-20191218-0000068,,,,
,,,,,,,,,Jurong Town Corporation,Security Division,DEPARTMENT-20191121-0000061,,,,
,,,,,,,,,Jurong Town Corporation,Warehouse Department,DEPARTMENT-20191121-0000065,,,,
requirements/export docker image.txt 0 → 100644
View file @ ac1c6025
EXPORT IMAGE:
-------------------------
docker save IMAGE_NAME_HERE > latest.tar
-=---------------------
BUILD IMAGE:
-------------------------
docker load -i IMAGE_NAME
-------------------------
CREATE CONTAINER
-----------------------------
BACK END:
docker run -d --restart=always -p 1010:8000 dev-rmsv2 python manage.py runserver 0.0.0.0:8000
------------------------
FRONT END:
docker run -d --restart=always -p 3001:3000 sit_rms_webv2 npm start
Clear Cache REDIS
config set stop-writes-on-bgsave-error no
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