Skip to content

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

Merge pull request #245 in RMS/api-main-service from gladys-dev2 to RMSv2 

* commit '31daeaa9':
  email templates
parents a2723c63 31daeaa9
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 54 deletions
app/entities/migrations/0012_auto_20191002_1023.py 0 → 100644
View file @ 2a40dcc7
# Generated by Django 2.2 on 2019-10-02 10:23
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0011_auto_20191001_1556'),
]
operations = [
migrations.RemoveField(
model_name='changerequestformapprovers',
name='tmp_approver',
),
migrations.RemoveField(
model_name='changerequestformattachments',
name='tmp_attach',
),
migrations.RemoveField(
model_name='changerequestformdetails',
name='tmp_detail',
),
migrations.RemoveField(
model_name='changerequestformheader',
name='old_form_code',
),
migrations.RemoveField(
model_name='changerequestformstakeholders',
name='tmp_stake',
),
]
app/entities/models.py
View file @ 2a40dcc7
...@@ -695,13 +695,8 @@ class ChangeRequestFormHeader(BaseHeader): ...@@ -695,13 +695,8 @@ class ChangeRequestFormHeader(BaseHeader):
max_length=255, max_length=255,
null=True, null=True,
blank=True) blank=True)
old_form_code = models.CharField(
max_length=255,
null=True,
blank=True)
requested_to_template_id = models.CharField( requested_to_template_id = models.CharField(
max_length=255) max_length=255)
requested_to_target_date = models.DateTimeField( requested_to_target_date = models.DateTimeField(
blank=True, blank=True,
null=True) null=True)
...@@ -745,12 +740,6 @@ class ChangeRequestFormApprovers(BaseApprover): ...@@ -745,12 +740,6 @@ class ChangeRequestFormApprovers(BaseApprover):
date_sent = models.DateTimeField( date_sent = models.DateTimeField(
blank=True, blank=True,
null=True) null=True)
tmp_approver = models.ForeignKey(
ChangeRequestTemplateApprovers,
null=True,
blank=True,
on_delete=models.PROTECT,
to_field='code')
class Meta: class Meta:
db_table = 'change_request_form_approvers' db_table = 'change_request_form_approvers'
...@@ -777,12 +766,6 @@ class ChangeRequestFormDetails(BaseDetails): ...@@ -777,12 +766,6 @@ class ChangeRequestFormDetails(BaseDetails):
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='form_code', to_field='form_code',
related_name='frm_details') related_name='frm_details')
tmp_detail = models.ForeignKey(
ChangeRequestTemplateDetails,
null=True,
blank=True,
on_delete=models.PROTECT,
to_field='code')
class Meta: class Meta:
db_table = 'change_request_form_details' db_table = 'change_request_form_details'
...@@ -812,12 +795,6 @@ class ChangeRequestFormStakeHolders(BaseStakeholder): ...@@ -812,12 +795,6 @@ class ChangeRequestFormStakeHolders(BaseStakeholder):
date_added = models.DateTimeField( date_added = models.DateTimeField(
blank=True, blank=True,
null=True) null=True)
tmp_stake = models.ForeignKey(
ChangeRequestTemplateStakeHolders,
null=True,
blank=True,
on_delete=models.PROTECT,
to_field='code')
class Meta: class Meta:
db_table = 'change_request_form_stakeholders' db_table = 'change_request_form_stakeholders'
...@@ -851,13 +828,6 @@ class ChangeRequestFormAttachments(BaseAttachment): ...@@ -851,13 +828,6 @@ class ChangeRequestFormAttachments(BaseAttachment):
blank=True, blank=True,
null=True null=True
) )
tmp_attach = models.ForeignKey(
ChangeRequestTemplateAttachments,
null=True,
blank=True,
related_name="template_attachments",
on_delete=models.PROTECT,
to_field='code')
class Meta: class Meta:
db_table = 'change_request_form_attachments' db_table = 'change_request_form_attachments'
......
app/helper/email_service/templates/RMS-ACTIONREQUIRED-VENDOR.html
View file @ 2a40dcc7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-ACTIONREQUIRED.html
View file @ 2a40dcc7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-ADMINRESET.html
View file @ 2a40dcc7
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
</head> </head>
<body style="font-family: arial;"> <body style="font-family: arial;">
<div style="max-width:100px!important;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg"/>
</div>
<h3>Resource Management System &#40;RMS&#41;</h3> <h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">Reset Password</h3><br> <h3 style="color:#888888;">Reset Password</h3><br>
...@@ -24,7 +21,7 @@ ...@@ -24,7 +21,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRACCEPTED.html
View file @ 2a40dcc7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRACKNOWLEDGE.html
View file @ 2a40dcc7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRAPPROVED.html
View file @ 2a40dcc7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRCANCELLED.html
View file @ 2a40dcc7
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRCOMPLETED.html
View file @ 2a40dcc7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CROVERDUE.html
View file @ 2a40dcc7
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREJECTED-VENDOR.html
View file @ 2a40dcc7
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-CRREJECTED.html
View file @ 2a40dcc7
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-NEWUSER.html
View file @ 2a40dcc7
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
</head> </head>
<body style="font-family: arial;"> <body style="font-family: arial;">
<div style="max-width:100px!important;">
<img src="https://s18.directupload.net/images/190807/wjwrxx5i.jpg"/>
</div>
<h3>Resource Management System &#40;RMS&#41;</h3> <h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">New User Created</h3><br> <h3 style="color:#888888;">New User Created</h3><br>
...@@ -24,7 +20,7 @@ ...@@ -24,7 +20,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-PASSWORD.html
View file @ 2a40dcc7
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-REMINDER-APPROVER.html
View file @ 2a40dcc7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
app/helper/email_service/templates/RMS-REMINDER-REQUESTOR.html
View file @ 2a40dcc7
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<p>RMS Team</p><br><br> <p>RMS Team</p><br><br>
<p>Powered by</p> <p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/> <img src="https://s3-ap-southeast-1.amazonaws.com/oneberry/img/logo_oneberry.png" class="img-responsive" style="width:150px;height:auto;" />
</body> </body>
</html> </html>
\ No newline at end of file
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