Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gayathri1990 2018-08-18 16:56:31 +05:30
commit 197cd39cfb
26 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -593,7 +593,7 @@ class StatusUpdation_model extends CI_Model {
$config = array(
'protocol' => 'smtp',
'smtp_host' => 'smtp.sendgrid.net',
'smtp_port' => 25,
'smtp_port' => 465,
'smtp_user' => 'apikey',
'smtp_pass' => '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',
'mailtype' => 'html',
@ -612,7 +612,7 @@ class StatusUpdation_model extends CI_Model {
$subj = $sub;
$this->email->subject($subj);
$this->email->message($htmlContent);
//Send email
//Send email 1
$result = $this->email->send();
// echo $this->email->print_debugger(); exit();
return $result;

2
Apollo/assets/js/controllers/activityCtrl.js
View File

@ -170,7 +170,7 @@ swal("Warning!", "Status are required", "warning");
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE =='R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/announcementCtrl.js
View File

@ -199,7 +199,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/batchCtrl.js
View File

@ -244,7 +244,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/branchCtrl.js
View File

@ -357,7 +357,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

6
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -408,7 +408,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
@ -686,7 +686,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
@ -889,7 +889,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/centerCtrl.js
View File

@ -196,7 +196,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/certificateCtrl.js
View File

@ -115,7 +115,7 @@ $scope.certificateForm = {
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/datacorrectionCtrl.js
View File

@ -22,7 +22,7 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter"
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/dayBookMasterCtrl.js
View File

@ -123,7 +123,7 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -20,7 +20,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
$scope.init = function () {
$scope.todayDate = new Date();
const LOCALTYPE = localDetail.localType;
if(LOCALTYPE === 'R002') {
if(LOCALTYPE === 'R002' || LOCALTYPE == 'R005') {
$scope.currentDate = new Date();
var d = new Date();
$scope.oneMonthBefore = d.setMonth(d.getMonth()-1);

2
Apollo/assets/js/controllers/employeeCtrl.js
View File

@ -67,7 +67,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
// load when html page load
$scope.init = function () {
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) {
$scope.currentDate = new Date();
$scope.localUserListCode = localDetail.localType;
$scope.localBranchID = localDetails.localBranchID;

2
Apollo/assets/js/controllers/incomeCtrl.js
View File

@ -18,7 +18,7 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
$scope.initHead = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
}else {
if(localDetail != null) {
$state.go('app.dashboard');

2
Apollo/assets/js/controllers/income_reportCtrl.js
View File

@ -23,7 +23,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/schCtrl.js
View File

@ -527,7 +527,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/semcoursemapCtrl.js
View File

@ -69,7 +69,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js
View File

@ -19,7 +19,7 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = localDetail.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
View File

@ -15,7 +15,7 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/sessionMasterCtrl.js
View File

@ -200,7 +200,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/sessionScheduleCtrl.js
View File

@ -276,7 +276,7 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002')) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/statusCtrl.js
View File

@ -18,7 +18,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
$scope.initHead = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002')) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) {
}else {
if(localDetail != null && LOCALTYPE != 'R001') {
$state.go('app.dashboard');

2
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -56,7 +56,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/studentStatusUpdateCtrl.js
View File

@ -13,7 +13,7 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_
$scope.initHead = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) {
}else {
if(localDetail != null && LOCALTYPE !='R001') {
$state.go('app.dashboard');

2
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -35,7 +35,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' || LOCALTYPE == 'R005' )) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/subjectCtrl.js
View File

@ -200,7 +200,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {

2
Apollo/assets/js/controllers/universityCtrl.js
View File

@ -31,7 +31,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
$scope.init = function() {
// alert();
const LOCALTYPE = localDetail.localType;
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' )) {
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
$scope.getUniversityList();
}else {
if(localDetail != null && LOCALTYPE != 'R001') {