AAIT#35678 SMS functie in case off emergency

svn path=/Website/trunk/; revision=28770
This commit is contained in:
Erik Groener
2016-04-06 10:30:31 +00:00
parent 3cb851c018
commit 2259be052e
2 changed files with 11 additions and 3 deletions

View File

@@ -107,6 +107,10 @@ function checkInput() {
// - leeg bericht (subject en/of body)
// - bericht zonder extra bevestiging naar iedereen
// Een SMS verzendt alleen het onderwerp. Als er alleen een SMS wordt verstuurd mag het berichtebveld leeg blijven
if ($("#cb_sms").is(":checked") && !($("#cb_mail").is(":checked") || $("#cb_fmessage").is(":checked") || $("#cb_portal").is(":checked")))
$("#ta_message").val("_");
if (!validateForm("u2"))
return false;
@@ -248,6 +252,9 @@ jQuery(document).ready(function()
<% } %>
<label for=cb_email><%=L("lcl_mes_email")%></label>
<input type="checkbox" id="cb_sms" name="cb_sms" value="1">
<label for="cb_sms"><%=L("lcl_mes_sms")%></label>
<input type=checkbox id=cb_fmessage name="cb_fmessage" value="1" checked>
<label for=cb_fmessage><%=L("lcl_mes_fmessage")%></label>
<% if (!lBestaandBericht) {
@@ -261,7 +268,7 @@ jQuery(document).ready(function()
</td>
</tr>
<tr>
<td class="label"><label><%=L("lcl_mes_subject")%>:</label></td>
<td class="label"><label><%=L("lcl_mes_subject_sms")%>:</label></td>
<td><input class="required fldmsgsubj" type="text" id="subject" name="subject" value="<%=(subject?"Re:":"")+ safe.htmlattr(subject)%>"></td>
<td class="label"><label><%=L("lcl_mes_priority")%>:</label></td>
<td>

View File

@@ -33,6 +33,7 @@ var vandatum = getFParamDate("datefrom", null); // periode tot
var totdatum = getFParamDate("dateto", null); // Periode van
var sendMailOption = getFParamInt("cb_email", -1) == 1;
var sendSMSOption = getFParamInt("cb_sms", -1) == 1;
var sendMessageOption = getFParamInt("cb_fmessage", -1) == 1;
var sendPortalOption = getFParamInt("cb_portal", -1) == 1;
@@ -77,7 +78,7 @@ else
}
var receivers = false;
if (sendMessageOption || sendMailOption)
if (sendMessageOption || sendMailOption || sendSMSOption)
{
var sql_exclude = " AND NOT EXISTS"
+ " (SELECT 1"
@@ -251,7 +252,7 @@ if (sendMessageOption || sendMailOption)
+ ", 'MESMES'"
+ ", " + new_message_key
+ ", " + safe.quoted_sql(mess_text_dsc) // als je deze null maakt wordt wel de srtnotificatietekst gebruikt. Wat is beter?
+ ", " + (0 + (sendMailOption == "1"? 2 : 0) + (sendMessageOption == "1"? 1 : 0) )
+ ", " + (0 + (sendMailOption == "1"? 2 : 0) + (sendMessageOption == "1"? 1 : 0) + (sendSMSOption == "1"? 4 : 0) )
+ ", NULL"
+ ", NULL"
+ ", NULL"