From f35dc058e41678811609adf759eaf8c815407a4a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 14 May 2018 11:32:24 +0530 Subject: [PATCH] table fixed --- .../images/aleks-dorohovich-26-unsplash.jpg | Bin Apollo/assets/images/logo.png | Bin Apollo/assets/js/controllers/dashboardCtrl.js | 70 ++++++++++++++++++ .../js/controllers/report_ans_bookletCtrl.js | 0 .../js/controllers/report_app_pendingCtrl.js | 0 .../js/controllers/report_balfeeCtrl.js | 0 .../js/controllers/report_certificateCtrl.js | 0 .../js/controllers/report_doc_pendingCtrl.js | 0 .../js/controllers/report_examfeeCtrl.js | 0 .../js/controllers/report_expenseCtrl.js | 0 .../report_markcard_certificateCtrl.js | 0 .../controllers/report_markcard_statusCtrl.js | 0 .../report_study_material_statusCtrl.js | 0 .../controllers/report_waiver_referalCtrl.js | 0 .../assets/views/report_answer_booklets.html | 0 .../views/report_application_pending.html | 0 Apollo/assets/views/report_balance_fee.html | 0 .../assets/views/report_document_pending.html | 0 .../assets/views/report_exam_writing_fee.html | 0 .../assets/views/report_waiver_referal.html | 0 .../views/student/studentDetailsModal.html | 33 +++++---- Apollo/images/playstoreapp.png | Bin Apollo/images/student/Dri_sthgKCp32EnG.jpeg | Bin 23 files changed, 89 insertions(+), 14 deletions(-) mode change 100644 => 100755 Apollo/assets/images/aleks-dorohovich-26-unsplash.jpg mode change 100644 => 100755 Apollo/assets/images/logo.png mode change 100644 => 100755 Apollo/assets/js/controllers/report_ans_bookletCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_app_pendingCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_balfeeCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_certificateCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_doc_pendingCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_examfeeCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_expenseCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_markcard_certificateCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_markcard_statusCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_study_material_statusCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/report_waiver_referalCtrl.js mode change 100644 => 100755 Apollo/assets/views/report_answer_booklets.html mode change 100644 => 100755 Apollo/assets/views/report_application_pending.html mode change 100644 => 100755 Apollo/assets/views/report_balance_fee.html mode change 100644 => 100755 Apollo/assets/views/report_document_pending.html mode change 100644 => 100755 Apollo/assets/views/report_exam_writing_fee.html mode change 100644 => 100755 Apollo/assets/views/report_waiver_referal.html mode change 100644 => 100755 Apollo/images/playstoreapp.png mode change 100644 => 100755 Apollo/images/student/Dri_sthgKCp32EnG.jpeg diff --git a/Apollo/assets/images/aleks-dorohovich-26-unsplash.jpg b/Apollo/assets/images/aleks-dorohovich-26-unsplash.jpg old mode 100644 new mode 100755 diff --git a/Apollo/assets/images/logo.png b/Apollo/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index 2c0a5dc9..b424092e 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -107,6 +107,76 @@ app.controller('dashboardCtrl', ["$scope","$rootScope", "toaster", "$filter", "n }]); + +/*Header Fixed */ +app.directive('fixedHeader', function($timeout){ + return { + restrict: 'A', + link: link + }; + + function link($scope, $elem, $attrs, $ctrl) { + var elem = $elem[0]; + + // wait for data to load and then transform the table + $scope.$watch(tableDataLoaded, function(isTableDataLoaded) { + if (isTableDataLoaded) { + transformTable(); + } + }); + + function tableDataLoaded() { + // first cell in the tbody exists when data is loaded but doesn't have a width + // until after the table is transformed + var firstCell = elem.querySelector('tbody tr:first-child td:first-child'); + return firstCell && !firstCell.style.width; + } + + function transformTable() { + // reset display styles so column widths are correct when measured below + angular.element(elem.querySelectorAll('thead, tbody')).css('display', ''); + + // wrap in $timeout to give table a chance to finish rendering + $timeout(function () { + // set widths of columns + angular.forEach(elem.querySelectorAll('tr:first-child th'), function (thElem, i) { + + var tdElems = elem.querySelector('tbody tr:first-child td:nth-child(' + (i + 1) + ')'); + var tfElems = elem.querySelector('tfoot tr:first-child td:nth-child(' + (i + 1) + ')'); + + var columnWidth = tdElems ? tdElems.offsetWidth : thElem.offsetWidth; + if (tdElems) { + tdElems.style.width = columnWidth + '150px'; + } + if (thElem) { + thElem.style.width = columnWidth + '150px'; + } + + }); + + // set css styles on thead and tbody + angular.element(elem.querySelectorAll('thead, tfoot')).css('display', 'block'); + + angular.element(elem.querySelectorAll('tbody')).css({ + 'display': 'block', + 'height': $attrs.tableHeight || 'inherit', + 'overflow': 'auto' + }); + + // reduce width of last column by width of scrollbar + var tbody = elem.querySelector('tbody'); + var scrollBarWidth = tbody.offsetWidth - tbody.clientWidth; + if (scrollBarWidth > 0) { + // for some reason trimming the width by 2px lines everything up better + scrollBarWidth -= 2; + var lastColumn = elem.querySelector('tbody tr:first-child td:last-child'); + lastColumn.style.width = (lastColumn.offsetWidth - scrollBarWidth) + 'px'; + } + }); + } + } +}); + app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POINTS", "$state", '$cookies', 'ipCookie', function ($scope, toaster, $filter, $http, apiPoint, $state, $cookies, ipCookie) { // get local cliend details diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index cb5e3927..b126d3c1 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -22,11 +22,16 @@ .ti-plus:before { color: #006f95; } + .carddesign{ + box-shadow: 0 3px 4px 0 rgba(0,0,0,0.14), + 0 3px 3px -2px rgba(0,0,0,0.12), + 0 1px 8px 0 rgba(0,0,0,0.2); + } -
+
@@ -187,7 +192,7 @@
-
+
@@ -231,13 +236,13 @@ -
+
- +
@@ -299,13 +304,13 @@ -
+
-
Sem/Year
+
@@ -344,13 +349,13 @@ -
+
-
+
@@ -391,13 +396,13 @@ -
+
-
+
@@ -441,13 +446,13 @@ -
+
-
+
@@ -511,13 +516,13 @@ -
+
-
Sem/Year
+
diff --git a/Apollo/images/playstoreapp.png b/Apollo/images/playstoreapp.png old mode 100644 new mode 100755 diff --git a/Apollo/images/student/Dri_sthgKCp32EnG.jpeg b/Apollo/images/student/Dri_sthgKCp32EnG.jpeg old mode 100644 new mode 100755
Sem/Year