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

Apollo/api/application/config/constants.php

@@ -153,6 +153,13 @@ defined('SESSIONSCHEDULEDETAILS') OR define('SESSIONSCHEDULEDETAILS','T_SessionS
 defined('STUDENTDOCUMENTDETAILS') OR define('STUDENTDOCUMENTDETAILS','T_StudentDocumentsDetails');
 defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','T_Student_DocumentTrack_Details');
 
+// branch relation db tables
+
+defined('UNIVERSITYBRANCHREL') OR define('UNIVERSITYBRANCHREL','T_Univ_Branch_Rel');
+defined('COURSEBRANCHREL') OR define('COURSEBRANCHREL','T_Course_Branch_Rel');
+defined('STATUSBRANCHREL') OR define('STATUSBRANCHREL','T_Status_Branch_Rel');
+defined('INOUTCOMEBRANCHREL') OR define('INOUTCOMEBRANCHREL','T_Income_Outcome_Branch_Rel');
+defined('CENTERBRANCHREL') OR define('CENTERBRANCHREL','T_Center_Branch_Rel');
 
 
 

Apollo/assets/js/controllers/studentViewCtrl.js

@@ -71,6 +71,76 @@ app.controller('studentViewCtrl', ["$scope","$rootScope", "toaster", "$filter",
 
 }]);
 
+
+/*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';
+                    }
+                });
+            }
+        }
+});
+
 /*modal controller
 * */
 app.controller('FeesModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", function ($scope, $rootScope, $modal, $log) {

Apollo/assets/views/partials/sidebar.html

@@ -1,3 +1,3 @@
 <!-- start: SIDEBAR -->
-<nav data-ng-include=" 'assets/views/partials/nav.html' " ng-if="getLoginDash != 'student'"></nav>
+<nav data-ng-include=" 'assets/views/partials/nav.html' "></nav>
 <!-- end: SIDEBAR -->

Apollo/assets/views/partials/top-navbar.html

@@ -6,10 +6,10 @@
 	</a>
 
 	<a class="navbar-brand" ui-sref="app.dashboard" ng-if="getLoginDash != 'student'">
-		<img style=" width: 50%;background-color: white;" ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
+		<img style=" width: 120px;background-color: white;" ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
 	</a>
 	<a class="navbar-brand" ui-sref="app.studentView" ng-if="getLoginDash == 'student'">
-		<img style=" width: 50%;background-color: white;" ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
+		<img style=" width: 120px;background-color: white;" ng-src="{{app.layout.logo}}" alt="{{app.name}}"/>
 	</a>
 	<a class="sidebar-toggler pull-right visible-md visible-lg" ng-click="app.layout.isSidebarClosed = !app.layout.isSidebarClosed">
 		<i class="ti-align-justify"></i>

Apollo/assets/views/student/studentView.html

@@ -247,13 +247,13 @@
                         <tabset class="tabbable">
 
                             <tab heading="Fees Details" id="fees">
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.feesDetails==false">
                                         <!--  <center>
                                               <h5 class="text-dark">No Fees Details!</h5>
                                           </center>-->
                                     </div>
-                                    <table class="table no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false">
+                                    <table class="table height-200 no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false" fixed-header>
                                         <thead>
                                         <tr>
                                             <th>Sem/Year</th>
@@ -449,13 +449,13 @@
                             </tab>
 
                             <tab heading="Document Details" id="document">
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.applicationDetails==false">
                                         <!--<center>
                                             <h5 class="text-dark">No Document Details!</h5>
                                         </center>-->
                                     </div>
-                                    <table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
+                                    <table class="table height-200 no-margin ng-scope" ng-if="course.applicationDetails!=false" fixed-header>
                                         <thead>
                                         <tr>
                                            <!-- <th>Type</th>-->
@@ -499,13 +499,13 @@
 
 
                             <tab heading="Mark Card Details" id="mark">
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.markCardDetails==false">
                                         <!--<center>
                                             <h5 class="text-dark">No Mark Card Details!</h5>
                                         </center>-->
                                     </div>
-                                    <table class="table no-margin ng-scope" ng-if="course.markCardDetails!=false">
+                                    <table class="table height-200 no-margin ng-scope" ng-if="course.markCardDetails!=false" fixed-header>
                                         <thead>
                                         <tr>
                                              <th>Sem/Year</th>
@@ -571,13 +571,13 @@
                                 </div>
                             </tab>
                             <tab heading="Study Material Details" id="material">
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.studyMaterialDetails==false">
                                        <!-- <center>
                                             <h5 class="text-dark">No Study Material Details!</h5>
                                         </center>-->
                                     </div>
-                                    <table class="table no-margin ng-scope" ng-if="course.studyMaterialDetails!=false">
+                                    <table class="table height-200 no-margin ng-scope" ng-if="course.studyMaterialDetails!=false" fixed-header>
                                         <thead>
                                         <tr>
                                             <th>Sem/Year</th>