diff --git a/Apollo/api/application/models/Announcement_model.php b/Apollo/api/application/models/Announcement_model.php
index e32c7915..3bd7d72b 100644
--- a/Apollo/api/application/models/Announcement_model.php
+++ b/Apollo/api/application/models/Announcement_model.php
@@ -75,8 +75,6 @@ class Announcement_model extends CI_Model {
$result['message'] = "Something went wrong.please try again";
}
-
-
return $result;
}
diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js
index c905b8a2..04eb8bda 100644
--- a/Apollo/assets/js/controllers/dashboardCtrl.js
+++ b/Apollo/assets/js/controllers/dashboardCtrl.js
@@ -64,3 +64,59 @@ app.controller('dashboardCtrl', ["$scope","toaster", "$filter", "ngTableParams",
}]);
+app.controller('OnotherCtrl', ["$scope", function ($scope) {
+
+ // Chart.js Data
+ $scope.data = [
+
+ {
+ value: 50,
+ color: '#46BFBD',
+ highlight: '#5AD3D1',
+ label: 'Student'
+ },
+ {
+ value: 100,
+ color: '#FDB45C',
+ highlight: '#FFC870',
+ label: 'Staff'
+ }
+ ];
+ $scope.total = 150;
+ // Chart.js Options
+ $scope.options = {
+
+ // Sets the chart to be responsive
+ responsive: false,
+
+ //Boolean - Whether we should show a stroke on each segment
+ segmentShowStroke: true,
+
+ //String - The colour of each segment stroke
+ segmentStrokeColor: '#fff',
+
+ //Number - The width of each segment stroke
+ segmentStrokeWidth: 2,
+
+ //Number - The percentage of the chart that we cut out of the middle
+ percentageInnerCutout: 50, // This is 0 for Pie charts
+
+ //Number - Amount of animation steps
+ animationSteps: 100,
+
+ //String - Animation easing effect
+ animationEasing: 'easeOutBounce',
+
+ //Boolean - Whether we animate the rotation of the Doughnut
+ animateRotate: true,
+
+ //Boolean - Whether we animate scaling the Doughnut from the centre
+ animateScale: false,
+
+ //String - A legend template
+ legendTemplate: '
<% for (var i=0; i- <%if(segments[i].label){%><%=segments[i].label%><%}%>
<%}%>
'
+
+ };
+
+}]);
+
diff --git a/Apollo/assets/js/main.js b/Apollo/assets/js/main.js
index 57c5c298..0a1bad8f 100644
--- a/Apollo/assets/js/main.js
+++ b/Apollo/assets/js/main.js
@@ -29,7 +29,7 @@ function ($rootScope, $state, $stateParams) {
isNavbarFixed: true, //true if you want to initialize the template with fixed header
isSidebarFixed: true, // true if you want to initialize the template with fixed sidebar
isSidebarClosed: true, // true if you want to initialize the template with closed sidebar
- isFooterFixed: true, // true if you want to initialize the template with fixed footer
+ isFooterFixed: false, // true if you want to initialize the template with fixed footer
theme: 'theme-5', // indicate the theme chosen for your project
logo: 'assets/images/logo.png', // relative path of the project logo
}
diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index e809332f..452e58da 100644
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -1,6 +1,6 @@
@@ -17,131 +17,179 @@
-
-
-
-
Today Follow Up Details
-
-
-
-
-
No Followup!
+
+
+
+
Today Follow Up Details
+
-
-
-
-
-
-
Pending Follow Up Details
-
-
-
-
-
No Pending Followup!
+
+
+
+
Pending Follow Up Details
+
-
-
-
-
-
-
Today Created Lead Details
-
-
-
-
-
No Lead Created By Today!
+
+
+
+
Today Created Lead Details
+
-
+
+
+
+
-
-
+
+
+
\ No newline at end of file