Skip to content

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

Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

parents 894b5ec7 45083098
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 80 deletions
app/applicationlayer/master/urls.py
View file @ f0c821a8
......@@ -5,7 +5,6 @@ from app.applicationlayer.master.Account.views import AdminAccountViewSet
from app.applicationlayer.master.company.views import AdminCompanyViewSet
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 cronjob
from app.applicationlayer.master.attachment.views import MasterAttachmentViewSet
router = routers.DefaultRouter()
......@@ -13,10 +12,8 @@ router.register(r'users', AdminAccountViewSet)
router.register(r'companies', AdminCompanyViewSet)
router.register(r'departments', AdminDepartmentViewSet)
router.register(r'attachments', MasterAttachmentViewSet)
# router.register(r'user-types', UserTypeViewSet)
urlpatterns = [
path('', include(router.urls)),
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 @ f0c821a8
......@@ -50,15 +50,4 @@ class UserTypeViewSet(APIView):
del data['results'][str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name)]
del data['results'][str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name)]
return Response(data)
class cronjob(APIView):
permission_classes = (AllowAny,)
def get(self, request, format=None):
args = ''
main_threading(args, sender.cronjob)
return Response("sent")
return Response(data)
\ No newline at end of file
app/helper/email_service/sender.py
View file @ f0c821a8
......@@ -13,15 +13,6 @@ from xhtml2pdf import pisa
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
def batch_email_users(args):
connection = email_connection.get_connection()
......@@ -124,36 +115,6 @@ def account_created(args):
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
def forgot_password(args):
reset_code = args[0]
......
app/helper/email_service/templates/cronjob.html deleted 100644 → 0
View file @ 894b5ec7
<!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 @ f0c821a8
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,,,,,,
,,,,,,,,,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 @ f0c821a8
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