artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 14:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1647 from satish-conflux/NEW_FIX_17_11

Browse Source 
Added tooltip for business rule
This commit is contained in:
Shaik Nazeer Hussain 2016-11-17 17:50:05 +05:30 committed by GitHub
commit d21b43dacd
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/controllers/organization/smscampaigns/CreateSmsCampaignController.js
View File

@ -10,7 +10,8 @@
scope.reportData.columnHeaders = [];
scope.reportData.data = [];
scope.submissionData = {};
scope.minDate = new Date();
scope.restrictDate = new Date();
scope.offices = [];
scope.staffs = [];
scope.selectedObjects = {};
@ -274,7 +275,7 @@
break;
case "text":
var selectedVal = scope.formData[paramDetails.inputName];
if (selectedVal == undefined || selectedVal == 0) {
if (selectedVal == undefined) {
var fieldId = '#' + paramDetails.inputName;
$(fieldId).addClass("validationerror");
var errorObj = new Object();

10
app/views/organization/smscampaigns/createsmscampaign.html
View File

@ -100,7 +100,7 @@
class="required">*</span></label>
<div class="col-sm-3">
<input id="scheduleDate" name="scheduleDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="campaignData.recurrenceStartDate"
is-open="opened" min="'2000-01-01'" max="'2050-01-01'" class="form-control" ng-required="campaignData.triggerType.value === 'Scheduled'"/>
is-open="opened" min="minDate" class="form-control" ng-required="campaignData.triggerType.value === 'Scheduled'" readonly/>
</div>
<div class="col-sm-3">
<form-validate valattributeform="createsmsform" valattribute="scheduleDate"/>
@ -158,8 +158,8 @@
<br/>
<div class="form-group">
<label class="control-label col-sm-2">{{'label.input.businessRule' |
translate}} <span class="required">*</span> </label>
<div class="col-sm-3">
translate}} <span class="required">*</span></label>
<div class="col-sm-4">
<select id="businessRule"
name="businessRule"
chosen="filteredBusinessRules"
@ -169,7 +169,9 @@
value="{{businessRuleOption}}" ng-change="reportSelected(campaignData.report.reportName)"
data-placeholder="{{'label.menu.businessRule' | translate}}" required="">
<option value=""></option>
</select>
</select>&nbsp;
<i class="icon-question-sign" tooltip="{{campaignData.report.reportDescription}}"
tooltip-append-to-body="true"></i>
</div>
<div class="col-sm-3">
<form-validate valattributeform="createsmsform" valattribute="businessRule"/>