WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-20 21:04:36 -04:00
parent f42a19c1c0
commit ffc45b7d15
3 changed files with 71 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/ALERT/alert_daily_stats.mailfile
+37 -22
View File
@@ -1,10 +1,10 @@
Subject: WrenchBoard Signup Report {{site_name}}
Subject: WrenchBoard Report {{site_name}}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8">
<title>WrenchBoard Signup Report {{site_name}}</title>
<title>WrenchBoard Report {{site_name}}</title>
<style type="text/css">
body {margin: 0; padding: 0; min-width: 100%!important;}
img {height: auto;}
@@ -13,9 +13,9 @@ img {height: auto;}
.innerpadding {padding: 10px 10px 10px 10px;}
.borderbottom {border-bottom: 1px solid #f2eeed;}
.subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
.h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
.h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
.bodycopy {font-size: 14px; line-height: 20px; text-align: center;}
.h2, h2 {color: #153643; font-family: sans-serif;}
.h1, h1 {font-size: 15px; line-height: 10px; font-weight: bold;}
.bodycopy {font-size: 10px; line-height: 10px; text-align: center;}
.trColor { background-color:#D2F7F4;}
.button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
.button a {color: #ffffff; text-decoration: none;}
@@ -49,7 +49,7 @@ img {height: auto;}
<tr>
<td style="padding: 1px 0 1px 0; text-align:center;">
<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
</td>
</tr>
<tr>
@@ -61,48 +61,63 @@ img {height: auto;}
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
</td>
</tr>
</table>
<![endif]-->
</td>
</tr>
<tr>
<td class="innerpadding borderbottom">
<table align="left" border="1" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">
<table align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px;">
<tr>
<td colspan="2"><h2>{{report_date}}</h2></td>
</tr>
<tr>
<td class="left" style="width:250px">Today Sign-up<h5>People that completed the sign-up</h5></td>
<td class="left" style="width:250px">Today Sign-up - <span>People that completed the sign-up</span></td>
<td class="bodycopy"><h1>{{today_signup}}</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">Pending Sign-up<h5>People still in the process not completed</h5></td>
<td class="bodycopy"><h2>{{today_pending_signup}}</h2></td>
<td class="left" style="width:250px">Pending Sign-up - <span>People still in the process not completed</span></td>
<td class="bodycopy"><h1>{{today_pending_signup}}</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">Public Active Jobs<h5>Jobs total shown to public now</h5></td>
<td class="left" style="width:250px">Public Active Jobs - <span>Jobs total shown to public now</span></td>
<td class="bodycopy"><h1>{{total_active_public_jobs}}</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">Interest Contats<h5>Total Show of interest today</h5></td>
<td class="bodycopy"><h2>{{total_task_interest}}</h2></td>
<td class="left" style="width:250px">Interest Contats - <span>Total Show of interest today</span></td>
<td class="bodycopy"><h1>{{total_task_interest}}</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">Session<h5>Session total created today</h5></td>
<td class="left" style="width:250px">Session - <span>Session total created today</span></td>
<td class="bodycopy"><h1>{{total_login}}</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">Private Tasks<h5>Private Task now</h5></td>
<td class="bodycopy"><h2>{{total_private_tasks}}</h2></td>
<td class="left" style="width:250px">Private Tasks - <span>Private Task now</span></td>
<td class="bodycopy"><h1>{{total_private_tasks}}</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">--------<h5>--------</h5></td>
<td class="left" style="width:250px">Mobile App Login - <span>Log in tracked from the mobile app</span></td>
<td class="bodycopy"><h1>{{count_mobile_login}}</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">-------------------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">--------<span>--------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr class="trColor">
<td class="left" style="width:250px">-------------------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
<tr>
<td class="left" style="width:250px">--------<span>--------</span></td>
<td class="bodycopy"><h1>-----</h1></td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
</td>
wrenchboard/email/JOB/job_due_reviewreminder.mailfile
+31 -100
View File
@@ -1,4 +1,4 @@
Subject: {{subject}}
Subject: {{subject}}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,155 +10,88 @@ Subject: {{subject}}
body {margin: 0; padding: 0; min-width: 100%!important;}
img {height: auto;}
.content {width: 100%; max-width: 600px;}
.header {padding: 40px 30px 20px 30px;}
.header {padding: 10px 10px 10px 10px;}
.innerpadding {padding: 10px 10px 10px 10px;}
.borderbottom {border-bottom: 1px solid #f2eeed;}
.subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;}
.h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;}
.h1 {font-size: 33px; line-height: 38px; font-weight: bold;}
.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;}
.bodycopy {font-size: 14px; line-height: 20px;}
.button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;}
.button a {color: #ffffff; text-decoration: none;}
.footer {padding: 20px 30px 15px 30px;}
.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;}
.footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;}
.footercopy a {color: #ffffff; text-decoration: underline;}
@media only screen and (max-width: 550px), screen and (max-device-width: 550px) {
body[yahoo] .hide {display: none!important;}
body[yahoo] .buttonwrapper {background-color: transparent!important;}
body[yahoo] .button {padding: 0px!important;}
body[yahoo] .button a {background-color: #e05443; padding: 15px 15px 13px!important;}
body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; background: #2f3942; border-radius: 5px; text-decoration: none!important; font-weight: bold;}
}
/*@media only screen and (min-device-width: 601px) {
.content {width: 600px !important;}
.col425 {width: 425px!important;}
.col380 {width: 380px!important;}
}*/
</style>
</head>
<body yahoo bgcolor="#f6f8f1">
<table width="100%" bgcolor="#f6f8f1" border="0" cellpadding="0" cellspacing="0">
<body bgcolor="#f6f8f1">
<tr>
<td>
<!--[if (gte mso 9)|(IE)]>
<table width="600" align="center" cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<![endif]-->
<![endif]-->
<table bgcolor="#ffffff" class="content" align="center" cellpadding="0" cellspacing="0" border="0">
<tr>
<td bgcolor="#c7d8a7" class="header">
<table width="70" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="70" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
<table width="425" align="left" cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<![endif]-->
<table class="col425" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 425px;">
<tr>
<td height="50">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="h1" style="padding: 5px 0 0 0;">
{{site_name}}
<td style="padding: 1px 0 1px 0; text-align:center;">
<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
</td>
</tr>
<tr>
<td class="subhead" style="padding: 0 0 0 3px;">
<td class="subhead" style="padding: 0 0 0 3px; text-align:center;">
{{site_trade_name}}
</td>
</tr>
</table>
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
</td>
</tr>
</table>
<![endif]-->
</td>
</tr>
<tr>
<td class="innerpadding borderbottom">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="h3">
<td class="h2">
<b>Dear {{firstname}}</b>,
</td>
</tr>
<tr>
<td class="bodycopy">
You now have <b>{{preview_count}} task(s)</b> at <a href="https://{{server_name}}/">{{site_name}}</a> in <b>"Preview"</b> status and your attention is needed.
</td>
</tr>
</table>
You now have <b>{{preview_count}} task(s)</b> at <a href="https://{{server_name}}/">{{site_name}}</a> in <b>"Preview"</b> status and your attention is needed.
</td>
</tr>
<tr>
<td class="innerpadding borderbottom">
<table width="115" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="115" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
<table width="380" align="left" cellpadding="0" cellspacing="0" border="0">
<tr>
<td>
<![endif]-->
<table class="col380" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 380px;">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0" class="bodycopy" style="font-size: 14px; font-family: sans-serif; border: 1px solid #f2eeed; background-color:#e6f9ff;">
<tr>
<td>
<td class="bodycopy">
<hr size="1">
It is essential that you login and process the task(s) appropriately. In the event of no response from you, <a href="https://{{server_name}}/">{{site_name}}</a> will automatically pay the client and close the task for you in few hours.
</td>
</tr>
<tr>
<td>
<b>Delivery Date: </b>
{{delivery_date}}
<tr>
<td class="bodycopy">
<hr size="1">
<b>Delivery Date: </b> {{delivery_date}}
</td>
</tr>
<tr>
<td class="bodycopy">
<hr size="1">
<h4>Please <a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">login</a> into your account to manage this task.</h4>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td><h4>Please <a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">login</a> into your account to manage this task.</h4>
</td>
</tr>
</table>
<!--[if (gte mso 9)|(IE)]>
</td>
</tr>
</table>
<![endif]-->
</td>
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
<td class="innerpadding bodycopy">
Please contact us at https://{{server_name}}/contact if you have any question about this email.
@@ -172,12 +105,13 @@ Please contact us at https://{{server_name}}/contact if you have any question a
</td>
</tr>
<tr>
<td class="footer" bgcolor="#44525f">
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<td class="footer">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
You received this email because a subscriber to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
&reg; {{site_name}} 2022<br/>
You received this email because you subscribe to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -210,8 +144,5 @@ You received this email because a subscriber to {{site_name}}. If you get this e
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/src/shared_tool/site_crons.cc
+3 -1
View File
@@ -225,12 +225,14 @@ long SignUpStats(CVars in, CVars &out) {
load_db_record(out, "SELECT count(id) AS today_signup FROM members WHERE added::date = now()::date");
load_db_record(out, "SELECT count(id) AS today_pending_signup FROM members_pending WHERE added::date = now()::date");
load_db_record(out, "SELECT TO_CHAR(NOW() :: DATE, 'Day Mon dd, yyyy') AS report_date");
load_db_record(out, "SELECT TO_CHAR(NOW(), 'Day Mon dd, yyyy hh:mm AM') AS report_date");
load_db_record(out, "SELECT count(*) AS total_task_interest FROM members_offer_interest WHERE added::date = now()::date");
load_db_record(out, "SELECT count(id) AS total_active_public_jobs FROM members_jobs_offer WHERE status=1 AND public_view= 1 AND expire> now()");
load_db_record(out, "SELECT count(*) AS total_login FROM members_session WHERE created::date=now()::date");
load_db_record(out, "SELECT count(id) AS total_private_tasks FROM members_jobs_offer WHERE status=1 AND public_view= 0 AND expire> now()");
load_db_record(out, "SELECT count(*) AS count_mobile_login FROM mobile_login WHERE updated::date = now()::date");
in = out;