issues fixes : ps
This commit is contained in:
parent
6c5fdbaa68
commit
146a8b3378
@ -603,7 +603,17 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
};
|
||||
$scope.open1 = function (arr,type,filterby) {
|
||||
var values = arr;
|
||||
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '4'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -614,16 +624,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '5'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '6'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -634,16 +634,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
var modalInstance1 = $modal.open({
|
||||
templateUrl: 'assets/views/student/studentPaymentModal.html',
|
||||
controller: 'ModalInstanceCtrl1',
|
||||
|
||||
@ -553,7 +553,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -2521,7 +2521,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -554,7 +554,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -571,7 +571,18 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
// if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '4'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -582,16 +593,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '5'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '6'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -602,16 +603,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
var modalInstance1 = $modal.open({
|
||||
templateUrl: 'assets/views/student/studentPaymentModal.html',
|
||||
controller: 'ModalInstanceCtrl1',
|
||||
|
||||
@ -2067,7 +2067,18 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values, type,filterby) {
|
||||
if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
// if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '4'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -2078,16 +2089,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '5'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '6'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
@ -2098,16 +2099,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
}
|
||||
}
|
||||
}
|
||||
if(type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
{
|
||||
if (values[i].Sem === filterby)
|
||||
{
|
||||
result.push(values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
var modalInstance1 = $modal.open({
|
||||
templateUrl: 'assets/views/student/studentPaymentModal.html',
|
||||
controller: 'ModalInstanceCtrl1',
|
||||
|
||||
@ -2703,7 +2703,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = values;}
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -572,7 +572,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -573,7 +573,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -405,7 +405,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -482,7 +482,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -527,7 +527,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -482,7 +482,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -556,7 +556,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -532,7 +532,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -477,7 +477,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -481,7 +481,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -274,7 +274,7 @@ $scope.generateButtonStatus = false;
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -502,7 +502,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -502,7 +502,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -477,7 +477,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -222,7 +222,7 @@ $scope.generateButtonStatus = false;
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -1037,7 +1037,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -3861,10 +3861,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
console.log('values',values);
|
||||
console.log(filterby);
|
||||
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -782,7 +782,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
});
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -551,7 +551,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
});
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -550,7 +550,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
|
||||
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -551,7 +551,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
|
||||
});
|
||||
};
|
||||
$scope.open1 = function (values,type,filterby) {
|
||||
if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
|
||||
if(type == '1' || type == '2'){ var result = values;}
|
||||
if(type == '3' || type == '5' || type == '7' || type == '8'){
|
||||
var result = [];
|
||||
for (var i = 0; i < values.length; i++)
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
|
||||
<fieldset>
|
||||
<div class="col-md-1 col-md-offset-10">
|
||||
<button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
|
||||
<button class="btn btn-success btn-o" ng-click="calltracking()">Update</button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user