From c7898cdf6b7d8cf64136a90e32a17f4d91a6f6bc Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 13 Jun 2018 19:02:28 +0530 Subject: [PATCH] Hallticket Issues Fixed 1185,1183 --- Apollo/assets/i18n/en.json | 2 +- Apollo/assets/js/config.constant.js | 2 +- Apollo/assets/js/config.router.js | 10 +- .../js/{ => controllers}/BatchmomentCtrl.js | 0 .../js/controllers/generateHallTicketCtrl.js | 40 ++--- .../views/hallticket/hallTicketPDF.html | 12 +- Apollo/assets/views/partials/nav.html | 19 +-- .../views/reregistration/batchmoment.html | 49 ------ .../views/reregistration/promotebatch.html | 154 ++++++++++++++++++ 9 files changed, 196 insertions(+), 92 deletions(-) rename Apollo/assets/js/{ => controllers}/BatchmomentCtrl.js (100%) delete mode 100644 Apollo/assets/views/reregistration/batchmoment.html create mode 100644 Apollo/assets/views/reregistration/promotebatch.html diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 5b672ee0..57d37362 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -163,7 +163,7 @@ "reregistration":{ "MAIN":"RE REGISTRATION", "REREGISTRATIONFORM":"RE REGISTRATION FORM", - "BATCHMOMENT":"BATCH MOMENT" + "BATCHMOVEMENT":"PROMOTE BATCH" } } }, diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 13a08b54..aa1b619e 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -181,7 +181,7 @@ app.constant('JS_REQUIRES', { // Re - reg for hall ticket 'reregistrationformCtrl':'assets/js/controllers/reregistrationformCtrl.js', // Batch moment for hall ticket - 'BatchmomentCtrl':'assets/js/controllers/Batchmoment.js', + 'BatchmomentCtrl':'assets/js/controllers/BatchmomentCtrl.js', //*** Filters 'htmlToPlaintext': 'assets/js/filters/htmlToPlaintext.js', diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9d4a5582..fc9fff63 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -682,13 +682,13 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Re Registration Form' } - }).state('app.reregistration.batchmoment',{ - url:'/batchmoment', - templateUrl:"assets/views/reregistration/batchmoment.html", - title:'Re Registration Form', + }).state('app.reregistration.batchmovement',{ + url:'/promotebatch', + templateUrl:"assets/views/reregistration/promotebatch.html", + title:'Promote Batch', resolve: loadSequence('ladda', 'angular-ladda', 'BatchmomentCtrl','ngTable','ui.select','spin', 'ui.mask'), ncyBreadcrumb: { - label: 'Re Registration Form' + label: 'Promote Batch' } }); diff --git a/Apollo/assets/js/BatchmomentCtrl.js b/Apollo/assets/js/controllers/BatchmomentCtrl.js similarity index 100% rename from Apollo/assets/js/BatchmomentCtrl.js rename to Apollo/assets/js/controllers/BatchmomentCtrl.js diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index e797dc7d..2eecd8b3 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -255,7 +255,7 @@ $scope.isLoaderTxt = "Loading..."; if (response.data.status==200 && response.data.hallTicketStatus) { $scope.pdfModel.universityDetails = response.data.hallTicketData.UniversityDetails; - + $scope.pdfModel.studentDetails = response.data.hallTicketData.studentDetails; $scope.pdfModel.batchDetails = $scope.selectedBatchName; $scope.pdfModel.courseDetails = $scope.selectedCourseName; @@ -316,7 +316,7 @@ $scope.isLoaderTxt = "Loading..."; // Controller for Hallticket Modal PDF app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", function ($scope, $modalInstance, pdfitems) { - + console.log('child'); $scope.localPdfUniverityDetails = pdfitems.universityDetails; $scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName; $scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address; @@ -392,8 +392,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.autoTableSetDefaults({ styles: {cellPadding: 3.0, fontSize: 10}, - headerStyles: {fillColor: [245, 245, 240], textColor: 0}, - + headerStyles: {fillColor: [245, 245, 240], textColor: 0} + }); var firstTableID = tableid+i; @@ -444,23 +444,23 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(22); - doc.text(200,50,$scope.universityNamePDF); + doc.text(160,50,$scope.universityNamePDF); doc.setFontSize(10); - doc.text(200,65,$scope.universityAddressPDF); + doc.text(160,65,$scope.universityAddressPDF); doc.setFontSize(10); - doc.text(200,80,$scope.universityEmailPDF); + doc.text(160,88,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); doc.line(45, 125, 445, 125); doc.setFontSize(10); doc.setFontType("bold"); - doc.text(110,115,examName); + doc.text(80,115,examName); doc.setFontType("normal"); - doc.text(70,140,rollNo); - doc.text(280,140,stuName); - doc.text(70,155,centerName); + doc.text(50,140,rollNo); + doc.text(230,140,stuName); + doc.text(50,155,centerName); //footer content var footerNote1 ="Note : 1. Without Identification Card Candidates shallnot Allowed to write for examination."; @@ -481,7 +481,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun var autoTableEndPosYvalue = 0; - sem1 = ""; + if(sem1 == "") { autoTableEndPosYvalue = 200; @@ -670,23 +670,23 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(22); - doc.text(200,50,$scope.universityNamePDF); + doc.text(160,50,$scope.universityNamePDF); doc.setFontSize(10); - doc.text(200,65,$scope.universityAddressPDF); + doc.text(160,65,$scope.universityAddressPDF); doc.setFontSize(10); - doc.text(200,80,$scope.universityEmailPDF); + doc.text(160,88,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); doc.line(45, 125, 445, 125); doc.setFontSize(10); doc.setFontType("bold"); - doc.text(110,115,examName); + doc.text(80,115,examName); doc.setFontType("normal"); - doc.text(70,140,rollNo); - doc.text(280,140,stuName); - doc.text(70,155,centerName); + doc.text(50,140,rollNo); + doc.text(230,140,stuName); + doc.text(50,155,centerName); //footer content var footerNote1 ="Note : 1. Without Identification Card Candidates shallnot Allowed to write for examination."; @@ -724,7 +724,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.autoTable(sem2.columns, sem2.data, options); } - / + if(sem2 != "" || sem1 != "") { diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 7d4684c4..667fe781 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -57,7 +57,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign @@ -75,7 +75,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign @@ -92,7 +92,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign @@ -109,7 +109,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign @@ -126,7 +126,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign @@ -146,7 +146,7 @@ - sem/yearSubject CodeSubject NameDateTimeInvigi.sign + sem/yearPaper CodeSubject NameDateTimeInvigi.sign diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 88ab98ac..41a0295b 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -341,6 +341,7 @@ +
  • @@ -348,7 +349,7 @@
    - RE REGISTRATION + REREGISTRATION
    @@ -356,20 +357,18 @@ -
    • +
  • diff --git a/Apollo/assets/views/reregistration/batchmoment.html b/Apollo/assets/views/reregistration/batchmoment.html deleted file mode 100644 index 348bd776..00000000 --- a/Apollo/assets/views/reregistration/batchmoment.html +++ /dev/null @@ -1,49 +0,0 @@ - - -
    -
    -
    - -

    {{ mainTitle }}

    - - BATCH MOMENT - -
    -
    -
    -
    - - - -
    -
    - - - - - - - - - diff --git a/Apollo/assets/views/reregistration/promotebatch.html b/Apollo/assets/views/reregistration/promotebatch.html new file mode 100644 index 00000000..aab2a0af --- /dev/null +++ b/Apollo/assets/views/reregistration/promotebatch.html @@ -0,0 +1,154 @@ + + +
    +
    +
    + +

    {{ mainTitle }}

    + + Promote Students From One Batch To Next Batch + +
    +
    +
    +
    + + + +
    + +
    + Search +
    + +
    + + + + +
    + + + + + + + + + + + --> + + +
    + + + + +
    + +
    + +
    + +
    + + +
    +
    +
    +

    {{isLoaderTxt}}

    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Student Name + + Mobile No + + EmailID + +
    {{p.Firstname}}{{p.Lastname}}{{p.MobileNumber}}{{p.EmailID}}
    + + + +
    +
    +
    + + + + +
    +
    + + + + + + + + +