From 280c6aa338fed874739200ed3a04b0c5dad9a8b2 Mon Sep 17 00:00:00 2001 From: resicovenba Date: Fri, 1 Dec 2017 16:35:06 +0530 Subject: [PATCH] announsement --- Apollo/api/application/config/routes.php | 4 +- .../controllers/Login_Controller.php | 30 +++ .../application/models/Announcement_model.php | 22 ++ Apollo/assets/js/app.js | 2 +- Apollo/assets/js/controllers/loginCtrl.js | 25 ++ Apollo/assets/views/login_login.html | 255 +++++------------- 6 files changed, 141 insertions(+), 197 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 5e276bff..ffcf9506 100644 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -128,8 +128,8 @@ $route['getTotalStudent'] = 'Dashboard_Controller/getTotalStudent'; $route['getTotalEmployee'] = 'Dashboard_Controller/getTotalEmployee'; $route['getTotalUsers'] = 'Dashboard_Controller/getTotalUsers'; - -$route['checkSMS'] = 'Student_Controller/checkSMS'; +/*login page announcement*/ +$route['getLoginAnnouncementDetails'] = 'Login_Controller/getLoginAnnouncementDetails'; diff --git a/Apollo/api/application/controllers/Login_Controller.php b/Apollo/api/application/controllers/Login_Controller.php index 463cd751..d7d9655e 100644 --- a/Apollo/api/application/controllers/Login_Controller.php +++ b/Apollo/api/application/controllers/Login_Controller.php @@ -30,6 +30,7 @@ class Login_Controller extends REST_Controller { $this->methods['login_post']['limit'] = 100; // 100 requests per hour per user/key $this->methods['login_delete']['limit'] = 50; // 50 requests per hour per user/key $this->load->model('Login_model', 'login_model'); + $this->load->model('Announcement_model', 'announcement_model'); } @@ -86,5 +87,34 @@ class Login_Controller extends REST_Controller { } } + /* + * get Announcement Details + * created by Surendiran + * */ + public function getLoginAnnouncementDetails_post() + { + $requestedBy = $this->post('requestedBy'); + + + $getAnnouncement = $this->announcement_model->getLoginAnnouncement(); + + if ($getAnnouncement) + { + $getAnnouncement['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getAnnouncement, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + } \ No newline at end of file diff --git a/Apollo/api/application/models/Announcement_model.php b/Apollo/api/application/models/Announcement_model.php index 3bd7d72b..346ebc91 100644 --- a/Apollo/api/application/models/Announcement_model.php +++ b/Apollo/api/application/models/Announcement_model.php @@ -79,4 +79,26 @@ class Announcement_model extends CI_Model { } + /* + * get announcement details + * created by Surendiran + * */ + public function getLoginAnnouncement() + { + $this->db->select('Heading,description'); + $this->db->from(ANNOUNCEMENT); + $this->db->where('IsActive',1); + $this->db->order_by('CreatedOn','DESC'); + $announcementDetails = $this->db->get(); + if($announcementDetails->result()){ + $result['AnnouncementStatus'] = true; + $result['details'] = $announcementDetails->result(); + } + else { + $result['AnnouncementStatus'] = false; + $result['message'] = "No records found!"; + } + return $result; + } + } \ No newline at end of file diff --git a/Apollo/assets/js/app.js b/Apollo/assets/js/app.js index 7ecd794c..c1a77768 100644 --- a/Apollo/assets/js/app.js +++ b/Apollo/assets/js/app.js @@ -3,7 +3,7 @@ */ 'use strict'; angular.module("clip-two", [ - 'ngAnimate', + // 'ngAnimate', 'ngCookies', 'ngStorage', 'ngSanitize', diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js index f8c5339a..cc30944f 100644 --- a/Apollo/assets/js/controllers/loginCtrl.js +++ b/Apollo/assets/js/controllers/loginCtrl.js @@ -79,4 +79,29 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc form.$setPristine(true); } } + + + $scope.myInterval = 2000; // load when html page load + $scope.init = function () { + $scope.getAnnouncementDetails(); + } + $scope.getAnnouncementDetails = function () { + var req = { + method: 'POST', + url: apiPoint.url + 'getLoginAnnouncementDetails/', + headers: { 'Content-Type': 'application/json' }, + data: {} + }; + $http(req).then(function (response) { + if (response.data.AnnouncementStatus) { + $scope.slides = response.data.details; + // alert(JSON.stringify($scope.slides)); + } else { + $scope.slides = [{ + "Heading" : " ", + "description" : " " + }] + } + }); + } }]); \ No newline at end of file diff --git a/Apollo/assets/views/login_login.html b/Apollo/assets/views/login_login.html index bb3464d2..d807fdbd 100644 --- a/Apollo/assets/views/login_login.html +++ b/Apollo/assets/views/login_login.html @@ -1,117 +1,4 @@ - - +
@@ -120,19 +7,31 @@ input#img-5:checked ~ .nav-dots label#img-dot-5{ + + + + + + + + + + + + + + + + +