Skip to content

Commit

Permalink
Merge pull request #34 from ECLK/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@MrClemRkz
MrClemRkz authored Jul 1, 2020
2 parents ae53c5a + 038c352 commit 8c5c87a
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 48 deletions.
35 changes: 20 additions & 15 deletions templates/incidents/complaints/daily_summary_report.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,53 +50,58 @@ module.exports = (data) => {
.thin-line-height {
line-height: 0.8
}
.footer-contacts {
.footer-contacts, .top-address {
line-height: 1;
font-size: 0.9em;
}
</style>
</head>
<body class="document-border">
<div class="container">
<div class="row hdr">
<div class="col-2">
<div class="row" style="text-align:center">
<div class="col-5" style="text-align:right">
<img
src="${baseURL}/assets/national-emblem.png"
alt="emblem-srilanka"
style="width:4rem;"
style="width:3.3rem;"
/>
</div>
<div class="col-8 text-center">
<div class="col-5" style="text-align:left; line-height:1rem">
<h3>මැතිවරණ කොමිෂන් සභාව</h3>
<h3>தேர்தல் ஆணையம்</h3>
</div>
</div>
<div class="row">
<div class="col-6 rw1">
<div class="col-6" style="line-height:1rem">
<br />
දුරකථන අංක : 011-2868441, 2868442, 2868443 <br />
ෆැක්ස් : 011-2868426 <br />
web : www.elections.gov.lk &nbsp; &nbsp; e-mail : info@elections.gov.lk
</div>
<div class="col-6 adrs">
<div class="col-6" style="line-height:1rem">
මැතිවරණ කොමිෂන් සභා කාර්යාලය <br />
සරණ මාවත , රාජගිරිය (10107) <br />
සරණ මාවත, රාජගිරිය (10107) <br />
தேர்தல் ஆணையத்தின் அலுவலகம் <br />
சரணா மாவதா, ராஜகிரிய (10107) <br />
</div>
</div>
<hr />
<div class="row">
<div class="col-12">
<p>අධ්‍යක්ෂ (පර්යේෂණ හා සැලසුම්),</p>
</div>
</div>
<div class="row">
<div class="col-12">
<h6 class="thin-line-height">
ගතවූ පැය 24 කාලය තුළ (${today}) මැතිවරණ පැමිණිලි සාරාංශ සටහන
ගතවූ පැය 24 කාලය තුළ (${data.dateInfo}) මැතිවරණ පැමිණිලි සාරාංශ සටහන
</h6>
<h6 class="thin-line-height">
Summary of the complaints during the past 24 hours (${today})
Summary of the complaints during the past 24 hours (${data.dateInfo})
</h6>
<h6 class="thin-line-height">
கடந்த 24 மணி நேரத்தில் புகார்களின் சுருக்கம் (${today})
கடந்த 24 மணி நேரத்தில் புகார்களின் சுருக்கம் (${data.dateInfo})
</h6>
</div>
</div>
Expand All @@ -114,7 +119,7 @@ module.exports = (data) => {
</th>
<th scope="col-2">
ප්‍රචණ්ඩ ක්‍රියා <br />
Disputes <br />
Violance <br />
வன்ெசல்க <br />
</th>
<th scope="col-2">
Expand All @@ -128,7 +133,7 @@ module.exports = (data) => {
</th>
<th scope="col-2">
පැමිණිලි සංඛ්‍යාව <br />
Amount of Complaints <br />
Number of Complaints <br />
புகார்களின் எண்ணிக்கை <br />
</th>
</tr>
Expand Down Expand Up @@ -167,7 +172,7 @@ module.exports = (data) => {
</th>
<th scope="col-2">
ප්‍රචණ්ඩ ක්‍රියා <br />
Disputes <br />
Violance <br />
வன்ெசல்க <br />
</th>
<th scope="col-2">
Expand All @@ -181,7 +186,7 @@ module.exports = (data) => {
</th>
<th scope="col-2">
පැමිණිලි සංඛ්‍යාව <br />
Amount of Complaints <br />
Number of Complaints <br />
புகார்களின் எண்ணிக்கை <br />
</th>
</tr>
Expand Down
25 changes: 12 additions & 13 deletions templates/incidents/complaints/daily_summary_report_districtwise.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,36 @@ module.exports = data => {
margin-top: 3px;
margin-bottom: 3px;
}
h5.heading {
margin-bottom: 0px
}
</style>
</head>
<body class="document-border">
<div class="container">
<div class="row text-center">
<div class="col-12">
<h5 class="bold">මහමැතිවරණය - 2020.${electionDate.getMonth() +
1}.${electionDate.getDate()}</h5>
<h5 class="bold">நாடாளுமன்றத் தேர்தல் - 2020.${electionDate.getMonth() +
1}.${electionDate.getDate()}</h5>
<h5 class="bold">Parliamentary Election - 2020.${electionDate.getMonth() +
1}.${electionDate.getDate()}</h5>
<h5 class="bold heading">පාර්ලිමේන්තු මැතිවරණය - ${electionDate.getFullYear()}</h5>
<h5 class="bold heading">நாடாளுமன்றத் தேர்தல் - ${electionDate.getFullYear()}</h5>
<h5 class="bold heading">Parliamentary Election - ${electionDate.getFullYear()}</h5>
</div>
</div>
<hr />
<div class="row text-center">
<div class="col-12">
<h5>මැතිවරණ පැමිණිලි සාරාංශ වාර්තාව</h5>
<div class="col-12 headings">
<h5 class="heading">මැතිවරණ පැමිණිලි සාරාංශ වාර්තාව</h5>
<h6>(දිස්ත්‍රික් මැතිවරණ පැමිණිලි කළමනාකරණ මධ්‍යස්ථාන)</h6>
<h5>தேர்தல் முறைப்பாடுகள் சுருக்க அறிக்கை</h5>
<h5 class="heading">தேர்தல் முறைப்பாடுகள் சுருக்க அறிக்கை</h5>
<h6>(மாவட்ட தேர்தல்கள் முறைப்பாட்டு முகாமைத்துவ மத்திய நிலையங்கள்)</h6>
<h5>Election Complaints Summary</h5>
<h5 class="heading">Election Complaints Summary</h5>
<h6>(District Complaint Management Centers)</h6>
</div>
</div>
<hr />
<div class="row text-center">
<div class="col-12">
<span><u>2020.${today.getMonth() +
1}.${today.getDate()} - 00.00 pm</u></span>
<span><u>${data.dateInfo}</u></span>
</div>
</div>
Expand Down Expand Up @@ -209,7 +208,7 @@ function generateRows(complaintByDistrict) {
"බදුල්ල/பதுளை/Badulla",
"මොනරාගල/மொனராகலை/Monaragala",
"රත්නපුර/இரத்தினபரி/Ratnapura",
"කෑගල්ල/கேகாலை/Kagalle"
"කෑගල්ල/கேகாலை/Kegalle"
];

return districts
Expand Down
39 changes: 19 additions & 20 deletions templates/incidents/complaints/daily_summery_report_categorywise.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,26 @@ module.exports = data => {
</head>
<body class="document-border">
<table>
<tr>
<th style="border: none; width: 150px">
<img
src="${baseURL}/assets/national-emblem.png"
alt="emblem-srilanka"
style="height:100px;"
/>
</th>
<th style="border: none">
<div class="bold">මහමැතිවරණය - 2020</div>
<tr>
<th style="border: none; width: 150px">
<img
src="${baseURL}/assets/national-emblem.png"
alt="emblem-srilanka"
style="height:100px;"
/>
</th>
<th style="border: none">
<div class="bold">පාර්ලිමේන්තු මැතිවරණය - 2020</div>
<div class="bold">பாராளுமன்றத் தேர்தல் - 2020</div>
<div class="bold">Parliamentary Election - 2020</div>
</th>
<th style="border: none; width: 150px">
<img
src="${baseURL}/assets/elections-logo.jpg"
alt="elections-logo"
style="height:100px;"
/>
</th>
</th>
<th style="border: none; width: 150px">
<img
src="${baseURL}/assets/elections-logo.jpg"
alt="elections-logo"
style="height:100px;"
/>
</th>
</tr>
<tr class="grey" style="height: 70px;">
<th colspan="3">
Expand All @@ -84,8 +84,7 @@ module.exports = data => {
தேர்தல் முறைப்பாடுகள் 24 மணித்தியால சுருக்க அறிக்கை (தேர்தல்கள் முறைப்பாட்டு முகாமைத்துவ மத்திய நிலையம்)
</div>
<div>
Election Complaints 24 hour summery (Election Complaints Management
Centre)
Election Complaints 24 hour summery (Election Complaints Management Centre)
</div>
</th>
</tr>
Expand Down

0 comments on commit 8c5c87a

Please sign in to comment.