Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
resicovenba
commit
fff2c9be6a
@ -129,6 +129,10 @@ defined('DAYBOOKMASTER') OR define('DAYBOOKMASTER','T_DayBookMaster');
|
||||
defined('INCOMEOUTCOMEMASTER') OR define('INCOMEOUTCOMEMASTER','T_Income_Outcome_Master');
|
||||
defined('FEES_INSTALLMENT') OR define('FEES_INSTALLMENT','T_Fees_Installments');
|
||||
defined('CENTER') OR define('CENTER','T_CenterMaster');
|
||||
defined('SUBJECTMASTER') OR define('SUBJECTMASTER','T_SubjectMaster');
|
||||
defined('SESSIONMASTER') OR define('SESSIONMASTER','T_Session_Master');
|
||||
defined('SESSIONDETAILS') OR define('SESSIONDETAILS','T_SessionDetails');
|
||||
defined('COURSESUBJECT') OR define('COURSESUBJECT','T_CourseSubject_Details');
|
||||
|
||||
|
||||
|
||||
|
||||
@ -227,9 +227,11 @@ $route['getCenterDetails'] = 'Center_Controller/getCenterDetails';
|
||||
//subject
|
||||
$route['getSubjectDetails'] = 'Subject_Controller/getSubjectDetails';
|
||||
$route['updateSubjectDetails'] = 'Subject_Controller/updateSubjectDetails';
|
||||
$route['getUniversity'] = 'Subject_Controller/getUniversity';
|
||||
$route['getCourseBatch'] = 'Subject_Controller/getCorsBatch';
|
||||
$route['addSubjectDetails'] = 'Subject_Controller/addSubjectDetails';
|
||||
|
||||
// session mater
|
||||
$route['addSessionMaterDetails'] = 'SessionMater_Controller/addSessionMaterDetails';
|
||||
$route['getSessionMaterDetails'] = 'SessionMater_Controller/getSessionMaterDetails';
|
||||
$route['updateSessionMaterDetails'] = 'SessionMater_Controller/updateSessionMaterDetails';
|
||||
|
||||
|
||||
|
||||
@ -99,13 +99,14 @@ class Center_Controller extends REST_Controller {
|
||||
$details['CenterCode'] = $this->post('CenterCode');
|
||||
$details['CenterName'] = $this->post('CenterName');
|
||||
$details['CenterAddress'] = $this->post('Address');
|
||||
$details['Comments'] = $this->post('Comments');
|
||||
$details['Comments'] = $this->post('Comments');
|
||||
$CenterID=$this->post('CenterID');
|
||||
$details['IsActive'] = $this->post('status');
|
||||
$details['UpdateBy'] = $this->post('updateBy');
|
||||
$details['UpdateOn'] = $now->format("Y-m-d H:i:s");
|
||||
|
||||
|
||||
$updateDetails = $this->center_model->updateCenter($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$updateDetails = $this->center_model->updateCenter($details,$CenterID);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
|
||||
if ($updateDetails)
|
||||
{
|
||||
|
||||
118
Apollo/api/application/controllers/SessionMater_Controller.php
Normal file
118
Apollo/api/application/controllers/SessionMater_Controller.php
Normal file
@ -0,0 +1,118 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: karthi
|
||||
* Date: 2/7/18
|
||||
* Time: 10:37 AM
|
||||
*/
|
||||
class SessionMater_Controller extends REST_Controller {
|
||||
|
||||
function __construct()
|
||||
{
|
||||
// Construct the parent class
|
||||
parent::__construct();
|
||||
|
||||
// Configure limits on our controller methods
|
||||
// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
|
||||
$this->methods['addSessionMaterDetails_post']['limit'] = 100; // 50 requests per hour per user/key
|
||||
$this->methods['getSessionMaterDetails_post']['limit'] = 500; // 50 requests per hour per user/key
|
||||
$this->methods['updateSessionMaterDetails_post']['limit'] = 500;// 500 requests per hour per user/key
|
||||
// load the model
|
||||
$this->load->model('SeesionMaster_model', 'sessionM_model');
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* This method used to add session master details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function addSessionMaterDetails_post()
|
||||
{
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$details['SessionName'] = $this->post('sessionName');
|
||||
$details['UniversityID'] = $this->post('universityName');
|
||||
$details['CreatedBy'] = $this->post('createdBy');
|
||||
$details['IsActive'] = $this->post('status');
|
||||
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
|
||||
$sessionDetails = $this->sessionM_model->addSession($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($sessionDetails)
|
||||
{
|
||||
$sessionDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($sessionDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the response and exit
|
||||
$this->response([
|
||||
'message' => 'Something went wrong.please try again!',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/*
|
||||
* get session master details
|
||||
* created by kms
|
||||
* */
|
||||
public function getSessionMaterDetails_post()
|
||||
{
|
||||
$requestedBy = $this->post('requestedBy');
|
||||
$getSession = $this->sessionM_model->getSession($requestedBy);
|
||||
if ($getSession)
|
||||
{
|
||||
$getSession['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getSession, 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
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/*
|
||||
* update the session master details
|
||||
* created by kms
|
||||
* */
|
||||
public function updateSessionMaterDetails_post()
|
||||
{
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$details['SessionID'] = $this->post('sessionID');
|
||||
$details['SessionName'] = $this->post('sessionName');
|
||||
$details['IsActive'] = $this->post('status');
|
||||
$universityDetails['University'] = $this->post('university');
|
||||
$details['UpdatedBy'] = $this->post('updatedBy');
|
||||
$details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
|
||||
$updateDetails = $this->sessionM_model->updateSession($details,$universityDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
|
||||
if ($updateDetails)
|
||||
{
|
||||
$updateDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($updateDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the response and exit
|
||||
$this->response([
|
||||
'message' => 'Something went wrong.please try again!',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -32,24 +32,15 @@ class Subject_Controller extends REST_Controller {
|
||||
public function addSubjectDetails_post()
|
||||
{
|
||||
|
||||
$now = new DateTime();
|
||||
$save['UniversityName'] = $this->post('university');
|
||||
$save['Course'] = $this->post('course');
|
||||
|
||||
$save['Batch'] = $this->post('batch');
|
||||
$save['Comments'] = $this->post('Comment');
|
||||
$save['IsActive'] = 1;
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$details['SubjectCode'] = $this->post('SubjectCode');
|
||||
$details['SubjectName'] = $this->post('SubjectName');
|
||||
$details['IsActive'] = $this->post('Status');
|
||||
$details['CreatedBy'] = $this->post('createdBy');
|
||||
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
|
||||
$save['CreatedBy'] = $this->post('createdBy');
|
||||
$save['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
//$details['IsActive'] = $this->post('status');
|
||||
|
||||
|
||||
$jsonSemFeesData=$this->post('semFeesAmounts');
|
||||
|
||||
$subjectDetails = $this->subject_model->addSubject($save,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$subjectDetails = $this->subject_model->addSubject($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
|
||||
if ($subjectDetails)
|
||||
{
|
||||
@ -98,24 +89,25 @@ class Subject_Controller extends REST_Controller {
|
||||
|
||||
}
|
||||
/*
|
||||
* update the Subject details
|
||||
* update Subject details
|
||||
*
|
||||
* */
|
||||
public function updateSubjectDetails_post()
|
||||
{
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$updateID = $this->post('updateID');
|
||||
$save['Comments'] = $this->post('Comments');
|
||||
$save['IsActive'] = 1;
|
||||
$save['UpdatedBy'] = $this->post('updatedBy');
|
||||
$save['UpdatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
//$details['IsActive'] = $this->post('status');
|
||||
$jsonSemFeesData=$this->post('semFeesAmounts');
|
||||
$details['SubjectCode'] = $this->post('SubjectCode');
|
||||
$details['SubjectName'] = $this->post('SubjectName');
|
||||
$SubjectID = $this->post('SubjectID');
|
||||
$details['IsActive'] = $this->post('Status');
|
||||
$details['UpdatedBy'] = $this->post('updatedBy');
|
||||
$details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
|
||||
// print_r($SubjectID);die();
|
||||
|
||||
|
||||
$updateDetails = $this->subject_model->updateSubject($save,$jsonSemFeesData,$updateID);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
|
||||
$updateDetails = $this->subject_model->updateSubject($details,$SubjectID);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
// print_r($details,$SubjectID);die();
|
||||
if ($updateDetails)
|
||||
|
||||
{
|
||||
@ -134,48 +126,8 @@ class Subject_Controller extends REST_Controller {
|
||||
|
||||
|
||||
}
|
||||
//get university dropdown
|
||||
public function getUniversity_post() {
|
||||
$reqData = $this->post('data');
|
||||
$getUniversityListDetails = $this->subject_model->get_university_list();
|
||||
if ($getUniversityListDetails)
|
||||
{
|
||||
$getUniversityListDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getUniversityListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the response and exit
|
||||
$this->response([
|
||||
'message' => 'No list were found',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//get course & Batch dropdown
|
||||
public function getCorsBatch_post() {
|
||||
$data = $this->post('data');
|
||||
$getCourseBatchListDetails = $this->subject_model->get_courseBatch_list($data);// Check if the employee exist
|
||||
if ($getCourseBatchListDetails)
|
||||
{
|
||||
$getCourseBatchListDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getCourseBatchListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set the response and exit
|
||||
$this->response([
|
||||
'message' => 'No list were found',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ class Center_model extends CI_Model {
|
||||
|
||||
|
||||
/*
|
||||
* Add batch details
|
||||
* Add center details
|
||||
* created by subaramkumar
|
||||
*/
|
||||
|
||||
@ -40,7 +40,7 @@ class Center_model extends CI_Model {
|
||||
|
||||
|
||||
/*
|
||||
* Get batch details
|
||||
* Get center details
|
||||
* created by srk
|
||||
*/
|
||||
|
||||
@ -69,13 +69,23 @@ class Center_model extends CI_Model {
|
||||
}
|
||||
|
||||
/*
|
||||
* update batch details
|
||||
* update Center details
|
||||
* created by Srk
|
||||
*/
|
||||
public function updateCenter($arrayDetails=null)
|
||||
public function updateCenter($arrayDetails=null,$CenterID=null)
|
||||
{
|
||||
|
||||
$this->db->select('CenterCode');
|
||||
$this->db->where('CenterCode',$arrayDetails['CenterCode']);
|
||||
$updateStatus=$this->db->update(CENTER, $arrayDetails);
|
||||
//$this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']);
|
||||
$this->db->where('CenterCode !=',$arrayDetails['CenterCode']);
|
||||
if($this->db->get(CENTER)->first_row()){
|
||||
$result['centerStatus']=false;
|
||||
$result['message']= " This Center code already exist";
|
||||
}
|
||||
else{
|
||||
$this->db->where('CenterID',$CenterID);
|
||||
$updateStatus=$this->db->update(CENTER, $arrayDetails);
|
||||
if($updateStatus){
|
||||
|
||||
$result['centerStatus'] = true;
|
||||
@ -87,11 +97,14 @@ class Center_model extends CI_Model {
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -114,6 +114,7 @@ class Course_model extends CI_Model {
|
||||
public function getCourseUnivFeesTypes() {
|
||||
$result['universityDetails'] = $this->getUniversityDetails();
|
||||
$result['feesDetails'] = $this->getFeesDetails();
|
||||
$result['subjectetails'] = $this->getSubjectDetails();
|
||||
$result['courseStatus'] = true;
|
||||
return $result;
|
||||
}
|
||||
@ -255,6 +256,18 @@ class Course_model extends CI_Model {
|
||||
return $feesDetails->result();
|
||||
}
|
||||
|
||||
/*
|
||||
* get subject details
|
||||
* created by kms
|
||||
* */
|
||||
public function getSubjectDetails(){
|
||||
$this->db->select('UniversityID,UniversityName');
|
||||
$this->db->order_by('UniversityID','ASC');
|
||||
$this->db->where('IsActive','1');
|
||||
$universityDetails = $this->db->get(SUBJE);
|
||||
return $universityDetails->result();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
188
Apollo/api/application/models/SeesionMaster_model.php
Normal file
188
Apollo/api/application/models/SeesionMaster_model.php
Normal file
@ -0,0 +1,188 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: karthi
|
||||
* Date: 2/7/18
|
||||
* Time: 10:44 AM
|
||||
*/
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
class SeesionMaster_model extends CI_Model {
|
||||
|
||||
|
||||
/*
|
||||
* Add session master details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function addSession($arrayDetails=null)
|
||||
{
|
||||
|
||||
$this->db->select('SessionName');
|
||||
$this->db->where('SessionName', $arrayDetails['SessionName']);
|
||||
if($this->db->get(SESSIONMASTER)->first_row()){
|
||||
$result['sessionStatus'] = false;
|
||||
$result['message'] ="This sessions is already exist.";
|
||||
}
|
||||
else{
|
||||
$insertMaster['SessionName']=$arrayDetails['SessionName'];
|
||||
$insertMaster['CreatedBy']=$arrayDetails['CreatedBy'];
|
||||
$insertMaster['IsActive']=$arrayDetails['IsActive'];
|
||||
$insertMaster['CreatedOn']=$arrayDetails['CreatedOn'];
|
||||
|
||||
$this->db->insert(SESSIONMASTER, $insertMaster);
|
||||
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$insertDetails['SessionID']=$this->db->insert_id();
|
||||
foreach ($arrayDetails['UniversityID'] as $row1){
|
||||
$insertDetails['UniversityID']=$row1['UniversityID'];
|
||||
$insertDetails['CreatedBy']=$arrayDetails['CreatedBy'];
|
||||
$insertDetails['IsActive']=$arrayDetails['IsActive'];
|
||||
$insertDetails['CreatedOn']=$arrayDetails['CreatedOn'];
|
||||
$this->db->insert(SESSIONDETAILS, $insertDetails);
|
||||
|
||||
}
|
||||
|
||||
$result['sessionStatus'] = true;
|
||||
$result['message'] = "Sessions added successfully";
|
||||
} else {
|
||||
$result['sessionStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Get session master details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function getSession()
|
||||
{
|
||||
$this->db->select('SM.SessionID,SM.SessionName,GROUP_CONCAT(SD.UniversityID) as UniversityID,GROUP_CONCAT(SM.SessionID) as GrpID,SM.IsActive,GROUP_CONCAT(US.UniversityName) as UniversityName');
|
||||
$this->db->from(SESSIONMASTER.' as SM');
|
||||
$this->db->join(SESSIONDETAILS.' as SD', 'SM.SessionID = SD.SessionID');
|
||||
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = SD.UniversityID');
|
||||
$this->db->where('SD.IsActive','1');
|
||||
$this->db->order_by('SM.CreatedOn','DESC');
|
||||
$this->db->group_by('SM.SessionName','DESC');
|
||||
$sessionDetails = $this->db->get();
|
||||
if($sessionDetails->result()){
|
||||
|
||||
$result['sessionStatus'] = true;
|
||||
$result['details'] = $sessionDetails->result();
|
||||
}
|
||||
else {
|
||||
$result['sessionStatus'] = false;
|
||||
$result['message'] = "No records found!";
|
||||
}
|
||||
// load batch model for get university details
|
||||
$this->load->model('Batch_model', 'batch');
|
||||
$result['universityDetails'] = $this->batch->getUniversityDetails();
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* update session master details
|
||||
* created by kms
|
||||
* */
|
||||
public function updateSession($arrayDetails=null,$universityDetails=null)
|
||||
{
|
||||
$this->db->select('SessionName');
|
||||
$this->db->where('SessionName', $arrayDetails['SessionName']);
|
||||
$this->db->where('SessionID !=', $arrayDetails['SessionID']);
|
||||
if($this->db->get(SESSIONMASTER)->first_row()){
|
||||
$result['sessionStatus'] = false;
|
||||
$result['message'] ="This sessions is already exist.";
|
||||
}
|
||||
else{
|
||||
$this->db->where('SessionID', $arrayDetails['SessionID']);
|
||||
$upateStatus=$this->db->update(SESSIONMASTER, $arrayDetails);
|
||||
|
||||
if($upateStatus){
|
||||
$deactiveStatus['IsActive']=false;
|
||||
$deactiveStatus['UpdatedBy']=$arrayDetails['UpdatedBy'];
|
||||
$deactiveStatus['UpdatedOn']=$arrayDetails['UpdatedOn'];
|
||||
$this->db->where('SessionID ',$arrayDetails['SessionID']);
|
||||
$updateActivityStatusDeactive = $this->db->update(SESSIONDETAILS, $deactiveStatus);
|
||||
|
||||
if($updateActivityStatusDeactive){
|
||||
|
||||
if($universityDetails['University']){
|
||||
|
||||
foreach ($universityDetails['University'] as $urow){
|
||||
$this->db->select('ID');
|
||||
$this->db->where('SessionID',$arrayDetails['SessionID']);
|
||||
$this->db->where('UniversityID',$urow);
|
||||
if($this->db->get(SESSIONDETAILS)->first_row()){
|
||||
$existStatusUpdate['IsActive']=true;
|
||||
$existStatusUpdate['UpdatedBy']=$arrayDetails['UpdatedBy'];
|
||||
$existStatusUpdate['UpdatedOn']=$arrayDetails['UpdatedOn'];
|
||||
$this->db->where('SessionID',$arrayDetails['SessionID']);
|
||||
$this->db->where('UniversityID',$urow);
|
||||
$this->db->update(SESSIONDETAILS, $existStatusUpdate);
|
||||
}
|
||||
else{
|
||||
$update_array["UniversityID"]=$urow;
|
||||
$update_array["SessionID"]=$arrayDetails['SessionID'];
|
||||
$update_array["IsActive"]=true;
|
||||
$update_array["CreatedBy"]=$arrayDetails['UpdatedBy'];
|
||||
$update_array["CreatedOn"]=$arrayDetails['UpdatedOn'];
|
||||
$this->db->insert(SESSIONDETAILS, $update_array);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else{
|
||||
$activateStatus['IsActive']=true;
|
||||
$this->db->where('SessionID ',$arrayDetails['SessionID']);
|
||||
$this->db->update(SESSIONMASTER, $activateStatus);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
$result['sessionStatus'] = true;
|
||||
$result['message'] = "Sessions updated successfully";
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
$result['sessionStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
/*
|
||||
* Get university details
|
||||
* created by kms
|
||||
* */
|
||||
public function getUniversityDetails()//doubt
|
||||
{
|
||||
$this->db->select('UniversityID,UniversityName');
|
||||
$this->db->order_by('UniversityID','ASC');
|
||||
$this->db->where('IsActive','1');
|
||||
// $this->db->where_not_in('ID', $id);
|
||||
$universityDetails = $this->db->get(UNIVERSITY);
|
||||
return $universityDetails->result();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/**
|
||||
* Date: 11/9/17
|
||||
* Date: 6/2/18
|
||||
* Time: 5:28 PM
|
||||
*/
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
@ -9,219 +9,113 @@ class Subject_model extends CI_Model
|
||||
{
|
||||
|
||||
|
||||
public function addSubject($save=null,$jsonSemFeesData=null)
|
||||
public function addSubject($arrayDetails=null)
|
||||
{
|
||||
|
||||
|
||||
$this->db->insert('T_SubjectMaster', $save);
|
||||
$subject_id = $this->db->insert_id();
|
||||
if($this->db->affected_rows() == '1'){
|
||||
|
||||
if($jsonSemFeesData){
|
||||
foreach($jsonSemFeesData as $row)
|
||||
{
|
||||
|
||||
$this->db->select('SubjectCode');
|
||||
$this->db->where('SubjectCode',$arrayDetails['SubjectCode']);
|
||||
if($this->db->get('T_SubjectMaster')->first_row()){
|
||||
$result['SubjectStatus']=false;
|
||||
$result['message']="This subject code already exists";
|
||||
}else{
|
||||
|
||||
|
||||
$insertFeesArray['Subject_ID'] =$subject_id;
|
||||
$insertFeesArray['Semester'] =$row['Semester'];
|
||||
$insertFeesArray['SubjectCode'] =$row['SubjectCode'];
|
||||
$insertFeesArray['SubjectName'] =$row['SubjectName'];
|
||||
$insertFeesArray['CreatedOn'] =$save['CreatedOn'];
|
||||
$insertFeesArray['CreatedBy'] =$save['CreatedBy'];
|
||||
$this->db->insert('T_SubjectMaster',$arrayDetails);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
|
||||
$result['SubjectStatus']=true;
|
||||
$result['message']="Successfully Subject Code is added";
|
||||
|
||||
$this->db->insert('T_SubjectDetails', $insertFeesArray);
|
||||
|
||||
}
|
||||
|
||||
$result['SubjectStatus'] = true;
|
||||
$result['message'] = "Successfully Subject details added";
|
||||
|
||||
|
||||
|
||||
} else {
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
//update subject
|
||||
|
||||
public function updateSubject($save=null,$jsonSemFeesData=null,$updateID=null)
|
||||
{
|
||||
$this->db->where('ID',$updateID);
|
||||
$upateStatus=$this->db->update('T_SubjectMaster', $save);
|
||||
|
||||
|
||||
if($upateStatus) {
|
||||
|
||||
if ($jsonSemFeesData) {
|
||||
foreach ($jsonSemFeesData as $row)
|
||||
{
|
||||
$subID = $row['ID'];
|
||||
|
||||
$updateFeesArray['Subject_ID'] =$updateID;
|
||||
$updateFeesArray['Semester'] =$row['Semester'];
|
||||
$updateFeesArray['SubjectCode'] =$row['SubjectCode'];
|
||||
$updateFeesArray['SubjectName'] =$row['SubjectName'];
|
||||
$updateFeesArray['UpdatedOn'] = $save['UpdatedOn'];
|
||||
$updateFeesArray['UpdatedBy'] = $save['UpdatedBy'];
|
||||
|
||||
if($subID!='' OR $subID!=null){
|
||||
$this->db->where('ID', $subID);
|
||||
$this->db->update('T_SubjectDetails', $updateFeesArray);
|
||||
}
|
||||
else{
|
||||
$this->db->insert('T_SubjectDetails', $updateFeesArray);
|
||||
}
|
||||
|
||||
}
|
||||
$result['SubjectStatus'] = true;
|
||||
$result['message'] = "Successfully subject details updated";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
else {
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}else{
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Update Subject details
|
||||
* created by srk
|
||||
*/
|
||||
|
||||
public function updateSubject($arrayDetails=null,$SubjectID=null)
|
||||
{
|
||||
$this->db->select('SubjectCode');
|
||||
$this->db->where('SubjectCode',$arrayDetails['SubjectCode']);
|
||||
$this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']);
|
||||
if($this->db->get('T_SubjectMaster')->first_row()){
|
||||
$result['SubjectStatus']=false;
|
||||
$result['message']="This subject code is already exists";
|
||||
}else{
|
||||
$this->db->where('SubjectID',$SubjectID);
|
||||
$upateStatus=$this->db->update('T_SubjectMaster', $arrayDetails);
|
||||
|
||||
|
||||
|
||||
if($upateStatus){
|
||||
|
||||
$result['SubjectStatus'] = true;
|
||||
$result['message'] = "Successfully Subject details updated";
|
||||
}
|
||||
|
||||
else {
|
||||
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "Something went wrong.please try again";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
/*
|
||||
* Get subject details
|
||||
* created by srk
|
||||
*/
|
||||
|
||||
|
||||
|
||||
public function getSubject()
|
||||
{
|
||||
$this->db->select('*');
|
||||
$this->db->order_by('CreatedOn','DESC');
|
||||
$subjectDetails = $this->db->get('T_SubjectMaster');
|
||||
|
||||
|
||||
if($subjectDetails->result()){
|
||||
|
||||
$result['SubjectStatus'] = true;
|
||||
$result['details'] = $subjectDetails->result();
|
||||
}
|
||||
else {
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "No records found!";
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//get subject details
|
||||
public function getSubject()
|
||||
{
|
||||
$this->db->select('BS.BatchName,CU.ID,CS.CourseName,CU.Comments ,CU.IsActive,US.UniversityName');
|
||||
$this->db->from('T_SubjectMaster'.' as CU');
|
||||
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityName');
|
||||
$this->db->join(COURSE.' as CS', 'CS.CourseID = CU.Course');
|
||||
$this->db->join(BATCH.' as BS', 'BS.BatchCode = CU.Batch');
|
||||
|
||||
|
||||
$this->db->order_by('CU.CreatedOn','DESC');
|
||||
$subjectDetails = $this->db->get();
|
||||
|
||||
if($subjectDetails->result()){
|
||||
|
||||
$result['SubjectStatus'] = true;
|
||||
|
||||
foreach ($subjectDetails->result() as $row){
|
||||
$fetchData['ID']=$row->ID;
|
||||
$fetchData['CourseName']=$row->CourseName;
|
||||
$fetchData['BatchName']=$row->BatchName;
|
||||
|
||||
$fetchData['Comments']=$row->Comments;
|
||||
|
||||
$fetchData['IsActive']=$row->IsActive;
|
||||
|
||||
$fetchData['UniversityName']=$row->UniversityName;
|
||||
$fetchData['feesStructures'] = $this->getSubjectDetails($row->ID);
|
||||
|
||||
$storeSubjectArray[]=$fetchData;
|
||||
}
|
||||
$result['details'] = $storeSubjectArray;
|
||||
}
|
||||
else {
|
||||
$result['SubjectStatus'] = false;
|
||||
$result['message'] = "No records found!";
|
||||
}
|
||||
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// public function getUniversityDetails()
|
||||
// {
|
||||
// $this->db->select('UniversityID,UniversityName');
|
||||
// $this->db->order_by('UniversityID','ASC');
|
||||
// $this->db->where('IsActive','1');
|
||||
// $universityDetails = $this->db->get(UNIVERSITY);
|
||||
// return $universityDetails->result();
|
||||
// }
|
||||
|
||||
|
||||
|
||||
public function getSubjectDetails($ID=null)
|
||||
{
|
||||
|
||||
$this->db->select('ID,Subject_ID,Semester,SubjectCode,SubjectName');
|
||||
$this->db->order_by('ID','ASC');
|
||||
$this->db->where('Subject_ID',$ID);
|
||||
$this->db->from('T_SubjectDetails');
|
||||
$subjectDetails = $this->db->get();
|
||||
return $subjectDetails->result();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*** get university list******/
|
||||
public function get_university_list() {
|
||||
$this->db->select('*');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->from(UNIVERSITY);
|
||||
$this->db->where('IsActive',1);
|
||||
$univDetails = $this->db->get();
|
||||
$universityDetails = $univDetails->result();
|
||||
if (count($universityDetails) > 0) {
|
||||
$results['univList'] = true;
|
||||
$results['university_details'] = $universityDetails;
|
||||
} else {
|
||||
$results['univList'] = false;
|
||||
$results['message'] = 'No record found';
|
||||
}
|
||||
return $results;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**********get course&Batch for university********/
|
||||
|
||||
public function get_courseBatch_list($univId) {
|
||||
$this->db->select('C.CourseID, C.CourseName');
|
||||
$this->db->from(COURSE.' as C');
|
||||
$this->db->where('UniversityID',$univId);
|
||||
$this->db->where('IsActive',1);
|
||||
$courseDetails = $this->db->get();
|
||||
if($courseDetails->result()){
|
||||
$this->db->select('B.BatchCode, B.BatchName');
|
||||
$this->db->from(BATCH.' as B');
|
||||
$this->db->where('UniversityID',$univId);
|
||||
$this->db->where('IsActive',1);
|
||||
$batchDetails = $this->db->get();
|
||||
if( $batchDetails->result()) {
|
||||
$result['courseStatus'] = true;
|
||||
$result['course_details'] = $courseDetails->result();
|
||||
$result['batch_details'] = $batchDetails->result();
|
||||
} else {
|
||||
$result['courseStatus'] = false;
|
||||
$result['message'] = "No records found!";
|
||||
}
|
||||
}
|
||||
else {
|
||||
$result['courseStatus'] = false;
|
||||
$result['message'] = "No records found!";
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -71,7 +71,8 @@
|
||||
"CERTIFICATETYPE": "CERTIFICATE TYPE",
|
||||
"DAYBOOKMASTER":"INCOME/EXPENSE HEADS",
|
||||
"CENTERMASTER": "CENTER DETAILS",
|
||||
"SUBJECTMASTER":"SUBJECT MASTER"
|
||||
"SUBJECTMASTER":"SUBJECT MASTER",
|
||||
"SESSIONMASTER":"SESSION DETAILS"
|
||||
},
|
||||
"student": {
|
||||
"MAIN": "STUDENTS",
|
||||
|
||||
@ -165,6 +165,7 @@ app.constant('JS_REQUIRES', {
|
||||
'centerCtrl':'assets/js/controllers/centerCtrl.js',
|
||||
//SUBJECT MASTER
|
||||
'subjectCtrl':'assets/js/controllers/subjectCtrl.js',
|
||||
'sessionMasterCtrl':'assets/js/controllers/sessionMasterCtrl.js',
|
||||
|
||||
|
||||
//*** Filters
|
||||
|
||||
@ -220,10 +220,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
ncyBreadcrumb: {
|
||||
label: 'Subject Master'
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
.state('app.student', {
|
||||
}).state('app.master.sessionMaster', {
|
||||
url: '/session master',
|
||||
templateUrl: "assets/views/sessionMaster.html",
|
||||
resolve: loadSequence('ui.select','sessionMasterCtrl','ngTable', 'ladda', 'angular-ladda','spin'),
|
||||
title: 'Session Master',
|
||||
ncyBreadcrumb: {
|
||||
label: 'Session Master'
|
||||
},
|
||||
}).state('app.student', {
|
||||
url: '/student',
|
||||
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT DETAILS </div> </div>',
|
||||
title: 'Student',
|
||||
|
||||
@ -16,7 +16,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
/*
|
||||
* edit batch details
|
||||
* created by subaram
|
||||
*
|
||||
* */
|
||||
$scope.editId = -1;
|
||||
$scope.setEditId = function (pid) {
|
||||
@ -27,7 +27,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
/*
|
||||
* cancel edit div
|
||||
* created by subaram
|
||||
*
|
||||
* */
|
||||
$scope.cancel = function () {
|
||||
$scope.init();
|
||||
@ -44,7 +44,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
/*
|
||||
* Submit,update and reset center details
|
||||
* @params myModel
|
||||
* created by subaram
|
||||
*
|
||||
* */
|
||||
$scope.centerForm = {
|
||||
|
||||
@ -104,7 +104,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
reset: function (form) {
|
||||
|
||||
// $scope.myModel = angular.copy($scope.master);
|
||||
$scope.myModel = angular.copy($scope.master);
|
||||
form.$setPristine(true);
|
||||
$scope.myModel = {
|
||||
"centerCode": "",
|
||||
@ -122,7 +122,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
/*
|
||||
* update the center details
|
||||
* created by subaram
|
||||
*
|
||||
* */
|
||||
$scope.updateCenter = function (myModel, form, loading) {
|
||||
|
||||
@ -156,9 +156,10 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
data: {
|
||||
CenterCode: myModel.CenterCode,
|
||||
CenterName: myModel.CenterName,
|
||||
Address: myModel.CenterAddress,
|
||||
Comments:myModel.Comments,
|
||||
Address: myModel.CenterAddress,
|
||||
Comments:myModel.Comments,
|
||||
status: myModel.IsActive,
|
||||
CenterID:myModel.CenterID,
|
||||
updateBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
|
||||
228
Apollo/assets/js/controllers/sessionMasterCtrl.js
Normal file
228
Apollo/assets/js/controllers/sessionMasterCtrl.js
Normal file
@ -0,0 +1,228 @@
|
||||
'use strict';
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
*/
|
||||
|
||||
app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) {
|
||||
$scope.myModel = {
|
||||
"sessionName": "",
|
||||
"switchsetting": true
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* edit session details
|
||||
* created by kms
|
||||
* */
|
||||
$scope.editId = -1;
|
||||
$scope.setEditId = function (p) {
|
||||
|
||||
$scope.editId = p.SessionID;
|
||||
$scope.viewId = -1;
|
||||
$scope.splitUnivertyToArray = p.UniversityID.split(',');
|
||||
|
||||
$scope.editUniverSity = [];
|
||||
angular.forEach($scope.splitUnivertyToArray, function (values, keys) {
|
||||
|
||||
$scope.editUniverSity.push(values);
|
||||
})
|
||||
$scope.viewUniversity = {
|
||||
list: $scope.editUniverSity,
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
/*
|
||||
* cancel edit div
|
||||
* created by kms
|
||||
* */
|
||||
$scope.cancel = function () {
|
||||
$scope.init();
|
||||
$scope.editId = -1;
|
||||
|
||||
};
|
||||
|
||||
// sorting function for table params
|
||||
$scope.sort = function(keyname){
|
||||
$scope.sortKey = keyname; //set the sortKey to the param passed
|
||||
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
||||
}
|
||||
|
||||
/*
|
||||
* Submit,update and reset session details
|
||||
* @params myModel
|
||||
* created by kms
|
||||
* */
|
||||
$scope.sessionForm = {
|
||||
|
||||
submit: function (form, myModel,loading) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$name;
|
||||
}
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
|
||||
$scope.ldloading1 = {};
|
||||
|
||||
$scope.ldloading1[loading.replace('-', '_')] = true;
|
||||
|
||||
|
||||
var addSession = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addSessionMaterDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
sessionName: myModel.sessionName,
|
||||
universityName: myModel.universityName,
|
||||
status: myModel.switchsetting,
|
||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
$http(addSession).then(function (response) {
|
||||
if (response.data.status==200 && response.data.sessionStatus) {
|
||||
$scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "success");
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
} else {
|
||||
$scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
reset: function (form) {
|
||||
|
||||
$scope.myModel = {
|
||||
"sessionName": "",
|
||||
"switchsetting": true
|
||||
};
|
||||
form.$setPristine(true);
|
||||
}
|
||||
};
|
||||
/*
|
||||
* update the session details
|
||||
* created by kms
|
||||
* */
|
||||
$scope.updateSession = function (myModel,university, form, loading) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$stop_name;
|
||||
}
|
||||
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
} else {
|
||||
$scope.ldloading = {};
|
||||
|
||||
$scope.ldloading[loading.replace('-', '_')] = true;
|
||||
|
||||
|
||||
var update = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'updateSessionMaterDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
sessionID: myModel.SessionID,
|
||||
sessionName: myModel.SessionName,
|
||||
status: myModel.IsActive,
|
||||
university: university.list,
|
||||
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
$http(update).then(function (response) {
|
||||
if (response.data.status==200 && response.data.sessionStatus) {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
$scope.editId = -1;
|
||||
$scope.init();
|
||||
swal("", response.data.message, "success");
|
||||
|
||||
|
||||
} else {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
swal("", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
/*
|
||||
*get session details when page loading
|
||||
*
|
||||
* created by kms
|
||||
* */
|
||||
$scope.loader='';
|
||||
|
||||
$scope.emptyData='';
|
||||
|
||||
$rootScope.init = function () {
|
||||
$scope.universityList = [];
|
||||
var getSession = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getSessionMaterDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
|
||||
$http(getSession).then(function (response) {
|
||||
if (response.data.status==200 && response.data.sessionStatus) {
|
||||
|
||||
$scope.emptyData=true;
|
||||
$scope.loader=true;
|
||||
|
||||
$scope.data = response.data.details;
|
||||
|
||||
// $scope.university=response.data.universityDetails;
|
||||
|
||||
|
||||
|
||||
|
||||
} else {
|
||||
$scope.emptyData=false;
|
||||
$scope.loader=true;
|
||||
// $scope.university=response.data.universityDetails;
|
||||
|
||||
}
|
||||
angular.forEach(response.data.universityDetails, function (values, keys) {
|
||||
$scope.arrayData = {
|
||||
UniversityName: values.UniversityName,
|
||||
UniversityID: values.UniversityID
|
||||
};
|
||||
$scope.universityList.push($scope.arrayData);
|
||||
})
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
}]);
|
||||
@ -7,53 +7,27 @@
|
||||
app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state",'ipCookie', function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,ipCookie) {
|
||||
$scope.myModel = {
|
||||
|
||||
"university": "",
|
||||
"course": "",
|
||||
"batch": "",
|
||||
"comments":"",
|
||||
"SubjectCode": "",
|
||||
"SubjectNme": "",
|
||||
"switchsetting": true,
|
||||
|
||||
};
|
||||
|
||||
|
||||
$rootScope.updateMoreItems = [];
|
||||
/*
|
||||
* edit batch details
|
||||
* created by subaram
|
||||
* */
|
||||
$scope.editId = -1;
|
||||
$rootScope.setEditId = function (pid,p) {
|
||||
|
||||
|
||||
$rootScope.updateMoreItems=[];
|
||||
// find index for fees type drop down list
|
||||
|
||||
angular.forEach(p.feesStructures, function(value, key){
|
||||
$rootScope.updateMoreItems.push({
|
||||
"ID":value.ID,
|
||||
"Semester":value.Semester,
|
||||
"SubjectCode":value.SubjectCode,
|
||||
"SubjectName": value. SubjectName,
|
||||
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
$scope.setEditId = function (pid) {
|
||||
|
||||
$scope.editId = pid;
|
||||
$scope.viewId = -1;
|
||||
};
|
||||
|
||||
|
||||
$scope.viewId=-1;
|
||||
$scope.setEditI = function (pid,p) {
|
||||
$scope.editId=-1;
|
||||
$scope.init();
|
||||
$scope.viewId=p.ID;
|
||||
$scope.editId = pid;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* cancel edit div
|
||||
*
|
||||
* created by subaram
|
||||
* */
|
||||
$scope.cancel = function () {
|
||||
$scope.init();
|
||||
@ -67,13 +41,14 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Submit,update and reset Subject details
|
||||
* @params myModel
|
||||
*
|
||||
* */
|
||||
$scope.subjectFORM = {
|
||||
submit: function (form, myModel,semYearModel,loading,addMoreItems) {
|
||||
submit: function (form, myModel,loading) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -91,17 +66,10 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
|
||||
// $scope.ldloading1 = {};
|
||||
$scope.ldloading1 = {};
|
||||
|
||||
//$scope.ldloading1[loading.replace('-', '_')] = true;
|
||||
$rootScope.addMoreItems.push({
|
||||
|
||||
|
||||
Semester: semYearModel. Semester,
|
||||
SubjectCode:semYearModel.SubjectCode,
|
||||
SubjectName:semYearModel.SubjectName
|
||||
});
|
||||
|
||||
$scope.ldloading1[loading.replace('-', '_')] = true;
|
||||
|
||||
|
||||
var addSubject = {
|
||||
method: 'POST',
|
||||
@ -110,11 +78,9 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
university:myModel.university,
|
||||
course:myModel.course,
|
||||
batch:myModel.batch,
|
||||
semFeesAmounts:$rootScope.addMoreItems,
|
||||
Comment:myModel.Comment,
|
||||
SubjectCode:myModel.SubjectCode,
|
||||
SubjectName:myModel.SubjectName,
|
||||
Status: myModel.switchsetting,
|
||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
@ -122,13 +88,12 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
$http(addSubject).then(function (response) {
|
||||
if (response.data.status==200 && response.data.SubjectStatus) {
|
||||
|
||||
// $scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
$scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("Success!", response.data.message, "success");
|
||||
$state.go($state.current, {}, {reload: true});
|
||||
|
||||
} else {
|
||||
$rootScope.addMoreItems.splice($rootScope.addMoreItems.length-1);
|
||||
// $scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
$scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("Failed!", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
@ -136,222 +101,28 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
|
||||
}
|
||||
},
|
||||
reset: function (form) {
|
||||
$rootScope.addMoreItems = [];
|
||||
|
||||
$scope.myModel = angular.copy($scope.master);
|
||||
form.$setPristine(true);
|
||||
$scope.myModel = {
|
||||
|
||||
"university": "",
|
||||
"course": "",
|
||||
"batch": "",
|
||||
"comments":"",
|
||||
"switchsetting": true,
|
||||
reset: function (form) {
|
||||
|
||||
};
|
||||
$scope.myModelSemYear = {
|
||||
"Semester":"",
|
||||
"SubjectCode":"",
|
||||
"SubjectName":"",
|
||||
};
|
||||
|
||||
|
||||
$rootScope.myModelSemYear1 = {
|
||||
"Semester":"",
|
||||
"SubjectCode":"",
|
||||
"SubjectName":"",
|
||||
};
|
||||
}
|
||||
$scope.myModel = {
|
||||
"SubjectCode": "",
|
||||
"SubjectName": "",
|
||||
"switchsetting": true
|
||||
};
|
||||
form.$setPristine(true);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
$rootScope.addMoreItems = [];
|
||||
|
||||
|
||||
$scope.myModelSemYear = {
|
||||
"Semester":"",
|
||||
"SubjectCode":"",
|
||||
"SubjectName":"",
|
||||
};
|
||||
|
||||
|
||||
|
||||
$rootScope.addMoreFeesItems = function (model,form) {
|
||||
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$stop_name;
|
||||
}
|
||||
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
else {
|
||||
$rootScope.addMoreItems.push({
|
||||
|
||||
Semester: model.Semester,
|
||||
SubjectCode:model.SubjectCode,
|
||||
SubjectName:model.SubjectName
|
||||
});
|
||||
|
||||
|
||||
$scope.myModelSemYear.Semester="";
|
||||
$scope.myModelSemYear.SubjectCode="";
|
||||
$scope.myModelSemYear.SubjectName="";
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// //alert('Duplicate Semester: ' + checkDuplicateInObject('Semester', $rootScope.addMoreItems));
|
||||
// alert('Duplicate SubjectCode: ' + checkDuplicateInObject('SubjectCode', $rootScope.addMoreItems));
|
||||
// //alert('DuplicateSubjectName: ' + checkDuplicateInObject('SubjectName', $rootScope.addMoreItems));
|
||||
|
||||
|
||||
// //
|
||||
|
||||
|
||||
// if(checkDuplicateInObject('SubjectCode', $rootScope.addMoreItems) === false) {
|
||||
// $scope.myModelSemYear.SubjectCode="";
|
||||
|
||||
// }else{
|
||||
// $rootScope.addMoreItems.push({
|
||||
|
||||
// Semester: model.Semester,
|
||||
// SubjectCode:model.SubjectCode,
|
||||
// SubjectName:model.SubjectName
|
||||
// });
|
||||
|
||||
// }
|
||||
|
||||
// $scope.myModelSemYear.SubjectCode="";
|
||||
// $scope.myModelSemYear.Semester="";
|
||||
// $scope.myModelSemYear.SubjectName="";
|
||||
|
||||
// function checkDuplicateInObject(propertyName, inputArray) {
|
||||
// var seenDuplicate = true,
|
||||
// testObject = {};
|
||||
|
||||
// inputArray.map(function(item) {
|
||||
// var itemPropertyName = item[propertyName];
|
||||
// if (itemPropertyName in testObject) {
|
||||
// testObject[itemPropertyName].duplicate = true;
|
||||
// item.duplicate = true;
|
||||
// seenDuplicate = false;
|
||||
// }
|
||||
// else {
|
||||
// testObject[itemPropertyName] = item;
|
||||
// delete item.duplicate;
|
||||
// }
|
||||
// });
|
||||
|
||||
// return seenDuplicate;
|
||||
// }
|
||||
|
||||
|
||||
// function checkDuplicateInObject(propertyName, inputArray) {
|
||||
// // alert(JSON.stringify(inputArray));
|
||||
// var seenDuplicate = false;
|
||||
// $rootScope.testObject = {};
|
||||
|
||||
// // alert(propertyName);
|
||||
// // if(inputArray.length === 0) {
|
||||
// // return $rootScope.seenDuplicate = true;
|
||||
|
||||
// // } else{
|
||||
// inputArray.map(function(item) {
|
||||
// alert(JSON.stringify(item));
|
||||
// $rootScope.itemPropertyName = item[propertyName];
|
||||
// if ($rootScope.itemPropertyName in $rootScope.testObject) {
|
||||
// $rootScope.testObject[$rootScope.itemPropertyName].duplicate = true;
|
||||
// item.duplicate = true;
|
||||
// seenDuplicate = true;
|
||||
// alert('kd');
|
||||
// }
|
||||
// else {
|
||||
// $rootScope.testObject[$rootScope.itemPropertyName] = item;
|
||||
// delete item.duplicate;
|
||||
// }
|
||||
// // alert(JSON.stringify($rootScope.testObject));
|
||||
// });
|
||||
// // }
|
||||
|
||||
|
||||
// return seenDuplicate;
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
///***updateupdateMoreItems */
|
||||
$rootScope.updateMoreItems = [];
|
||||
|
||||
$rootScope.myModelSemYear1 = {
|
||||
"Semester":"",
|
||||
"SubjectCode":"",
|
||||
"SubjectName":"",
|
||||
};
|
||||
$rootScope.updateMoreFeesItems = function (model,form) {
|
||||
|
||||
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$stop_name;
|
||||
}
|
||||
/*update subject details
|
||||
* * @params myModel*/
|
||||
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
else {
|
||||
|
||||
$rootScope.updateMoreItems.push({
|
||||
|
||||
ID:"",
|
||||
Semester: model.Semester,
|
||||
SubjectCode:model.SubjectCode,
|
||||
SubjectName:model.SubjectName
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
$scope.myModelSemYear1.ID="";
|
||||
$scope.myModelSemYear1.Semester="";
|
||||
$scope.myModelSemYear1.SubjectCode="";
|
||||
$scope.myModelSemYear1.SubjectName="";
|
||||
}
|
||||
|
||||
////*****update subject details */
|
||||
$scope.updateSubject = function (myModel, form,semYear, loading) {
|
||||
$scope.updateSubject = function (myModel, form, loading) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -368,16 +139,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
} else {
|
||||
if(semYear. Semester!="" || semYear.SubjectCode!=""|| semYear. SubjectName!=""){
|
||||
$rootScope.updateMoreItems.push({
|
||||
ID:"",
|
||||
Semester:semYear. Semester,
|
||||
SubjectCode:semYear.SubjectCode,
|
||||
SubjectName: semYear. SubjectName,
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$scope.ldloading = {};
|
||||
|
||||
@ -393,113 +155,35 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
|
||||
data: {
|
||||
|
||||
semFeesAmounts:$rootScope.updateMoreItems,
|
||||
Comments:myModel.Comments,
|
||||
updateID: myModel.ID,
|
||||
SubjectCode:myModel.SubjectCode,
|
||||
SubjectName:myModel.SubjectName,
|
||||
Status:myModel.IsActive,
|
||||
SubjectID: myModel. SubjectID, //auto id
|
||||
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
$http(update).then(function (response) {
|
||||
if (response.data.status==200 && response.data.SubjectStatus) {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
$rootScope.updateMoreItems=[];
|
||||
$rootScope.myModelSemYear1.ID="";
|
||||
$rootScope.myModelSemYear1.Semester="";
|
||||
$rootScope.myModelSemYear1.SubjectCode="";
|
||||
$rootScope.myModelSemYear1.SubjectName="";
|
||||
|
||||
|
||||
|
||||
$scope.init();
|
||||
$rootScope.updateMoreItems.splice( $rootScope.updateMoreItems.length-1);
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
$scope.init();
|
||||
swal("Success!", response.data.message, "success");
|
||||
|
||||
$scope.editId = -1;
|
||||
|
||||
|
||||
} else {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
$scope.init();
|
||||
swal("Failed!", response.data.message, "error");
|
||||
$rootScope.updateMoreItems.splice( $rootScope.updateMoreItems.length-1);
|
||||
// $rootScope.addMoreItems.splice($rootScope.addMoreItems.length-1);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/////**********/// */
|
||||
var localDetail = JSON.parse(localStorage.getItem('localObj'));
|
||||
var localDetails = ipCookie('cookiechk');
|
||||
|
||||
$scope.init = function () {
|
||||
$scope.getUniversityList();
|
||||
}
|
||||
//GET UNIVERSITY dETAILS
|
||||
|
||||
$scope.universityData = '';
|
||||
$scope.getUniversityList = function () {
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getUniversity/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: localDetails
|
||||
}
|
||||
};
|
||||
$http(empListreq).then(function (response) {
|
||||
if (response.data.univList) {
|
||||
$scope.universityData = response.data.university_details;
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$scope.getUniversityList();
|
||||
|
||||
|
||||
|
||||
|
||||
//GET COURSE&BATCH
|
||||
|
||||
$scope.courseLoading = false;
|
||||
$scope.onSlecetUnivAdd = function () {
|
||||
$scope.courseDataAdd = '';
|
||||
$scope.batchDataAdd = '';
|
||||
$scope.myModel.course = '';
|
||||
$scope.myModel.batch = '';
|
||||
$scope.courseLoading = true;
|
||||
var univListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getCourseBatch/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: $scope.myModel.university
|
||||
}
|
||||
};
|
||||
$http(univListreq).then(function (response) {
|
||||
if (response.data.courseStatus) {
|
||||
$scope.courseLoading = false;
|
||||
$scope.courseDataAdd = response.data.course_details;
|
||||
$scope.batchDataAdd = response.data.batch_details;
|
||||
} else {
|
||||
$scope.courseLoading = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*get Subject details when page loading called from view file
|
||||
*
|
||||
* created by Srk
|
||||
* */
|
||||
|
||||
$scope.loader='';
|
||||
|
||||
@ -525,47 +209,9 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
|
||||
if (response.data.status==200 && response.data.SubjectStatus) {
|
||||
|
||||
$scope.emptyData=true;
|
||||
$scope.loader=true;
|
||||
|
||||
$scope.loader=true;
|
||||
$scope.data = response.data.details;
|
||||
//alert(JSON.stringify( $scope.data ));
|
||||
///
|
||||
// $scope.setModel = {
|
||||
// "feesType": $scope.data[0],
|
||||
|
||||
|
||||
// };
|
||||
// //alert(JSON.stringify( $scope.data[0] ));
|
||||
// // $scope.setTotalAmount=$scope.data[0].PayableFees;
|
||||
|
||||
|
||||
// $rootScope.updateMoreItems=[];
|
||||
|
||||
// if($scope.data[0].feesStructures != '')
|
||||
// // alert(JSON.stringify($scope.data[0].feesStructures))
|
||||
|
||||
// {
|
||||
// $scope.myModelSemYear1.ID=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].ID;
|
||||
// //alert(JSON.stringify( $scope.myModelSemYear1.ID ));
|
||||
// $rootScope.myModelSemYear1.Semester=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].Semester;
|
||||
// //alert(JSON.stringify( $scope.myModelSemYear1.Semester ));
|
||||
// $rootScope.myModelSemYear1.SubjectCode=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].SubjectCode;
|
||||
// //alert(JSON.stringify( $scope.myModelSemYear1.SubjectCode ));
|
||||
// $rootScope.myModelSemYear1.SubjectName=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].SubjectName;
|
||||
// //alert(JSON.stringify( $scope.myModelSemYear1.SubjectName ));
|
||||
|
||||
// for(var i=0; i < $scope.data[0].feesStructures.length-1; i++){
|
||||
// $rootScope.updateMoreItems.push($scope.data[0].feesStructures[i]);
|
||||
// }
|
||||
// }
|
||||
// // alert(JSON.stringify( $scope.data[0].feesStructures[i] ));
|
||||
|
||||
////////////
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} else {
|
||||
$scope.emptyData=false;
|
||||
$scope.loader=true;
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
<th ng-click="sort('CenterAddress')">Center Address
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='CenterAddress'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
<th>Comments</th>
|
||||
<!-- <th>Comments</th> -->
|
||||
<th>Status</th>
|
||||
<th> Action</th>
|
||||
|
||||
@ -83,18 +83,18 @@
|
||||
<td>{{p.CenterCode}}</td>
|
||||
<td>{{p.CenterName}}</td>
|
||||
<td>{{p.CenterAddress}}</td>
|
||||
<td>{{p.Comments}}</td>
|
||||
<!-- <td>{{p.Comments}}</td> -->
|
||||
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
|
||||
<td>
|
||||
|
||||
<a class="text-azure" id="editRowBtn{{p.CenterCode}}" ng-click="setEditId(p.CenterCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
<a class="text-azure" id="editRowBtn{{p.CenterID}}" ng-click="setEditId(p.CenterID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr ng-show="editId === p.CenterCode" ng-if="editId === p.CenterCode" >
|
||||
<tr ng-show="editId === p.CenterID" ng-if="editId === p.CenterID" >
|
||||
<td colspan="6" ng-include src="'assets/views/editCenterDetails.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
<input type="text" placeholder="Enter Center Code"
|
||||
tabindex="1" class="form-control" name="centercode"
|
||||
ng-model="p.CenterCode" ng-pattern="/^[a-zA-Z0-9\s]*$/" readonly required/>
|
||||
ng-model="p.CenterCode" ng-pattern="/^[a-zA-Z0-9\s]*$/" required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.centercode.$dirty && Form.centercode.$error.required">Center Code is required</span>
|
||||
<span class="error text-small block"
|
||||
|
||||
92
Apollo/assets/views/editSessionMaster.html
Normal file
92
Apollo/assets/views/editSessionMaster.html
Normal file
@ -0,0 +1,92 @@
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Update Session Details
|
||||
</legend>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.sessionName.$dirty && Form.sessionName.$invalid, 'has-success':Form.sessionName.$valid}">
|
||||
<label>
|
||||
Session Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Session Name"
|
||||
tabindex="2" class="form-control" name="sessionName" id="sessionName"
|
||||
ng-model="p.SessionName" ng-pattern="" required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.sessionName.$dirty && Form.sessionName.$error.required">Session name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.sessionName.$dirty && Form.sessionName.$error.pattern">Invalid session name </span>
|
||||
<!--<span class="success text-small"-->
|
||||
<!--ng-if="Form.sessionName.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid && viewUniversity.list.length==0, 'has-success':Form.university.$valid}">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
|
||||
<ui-select multiple ng-model="viewUniversity.list" tabindex="3">
|
||||
<ui-select-match placeholder="Select University">
|
||||
{{$item.UniversityName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices
|
||||
repeat="d.UniversityID as d in universityList | filter:$select.search">
|
||||
{{d.UniversityName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
|
||||
<input class="ng-hide" type="text" name="university"
|
||||
ng-model="viewUniversity.list"
|
||||
required>
|
||||
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.university.$dirty && Form.university.$error.required && viewUniversity.list.length==0">University is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-if="p.IsActive==true">
|
||||
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-if="p.IsActive==false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading3.zoom_in" tabindex="5" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateSession(p,viewUniversity,Form,'zoom-in')">
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="6" value="Cancel" ng-click="cancel();">
|
||||
|
||||
</input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<!-- class="editRowTd" -->
|
||||
@ -8,133 +8,8 @@
|
||||
</legend>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.University.$dirty && Form.University.$invalid, 'has-success':Form.University.$valid}">
|
||||
<label>
|
||||
Course Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Course Name"
|
||||
tabindex="2" class="form-control" name="University"
|
||||
ng-model="p.UniversityName" ng-pattern="" disabled required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.University.$dirty && Form.University.$error.required">University name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.University.$dirty && Form.University.$error.pattern">Invalid University name </span>
|
||||
<!--<span class="success text-small"-->
|
||||
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.coursename.$dirty && Form.coursename.$invalid, 'has-success':Form.coursename.$valid}">
|
||||
<label>
|
||||
Course Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Course Name"
|
||||
tabindex="2" class="form-control" name="coursename"
|
||||
ng-model="p.CourseName" ng-pattern="" disabled required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.coursename.$dirty && Form.coursename.$error.required">Course name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.coursename.$dirty && Form.coursename.$error.pattern">Invalid course name </span>
|
||||
<!--<span class="success text-small"-->
|
||||
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.coursecode.$dirty && Form.coursecode.$invalid, 'has-success':Form.coursecode.$valid}">
|
||||
<label>
|
||||
Batch <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Course ID"
|
||||
tabindex="1" class="form-control" name="coursecode"
|
||||
ng-model="p.BatchName" ng-pattern="" disabled required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.pattern">Invalid course id </span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.Comments.$dirty && Form.Comments.$invalid}">
|
||||
<label>
|
||||
Comments
|
||||
</label>
|
||||
<textarea placeholder="Enter Comment" tabindex="15" class="form-control textdsc" name="Comment" ng-model="p.Comments"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.Comments.$dirty && Form.Comments.$invalid">Comments is required</span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- <div class="col-md-3">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-if="p.IsActive==true">
|
||||
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-if="p.IsActive==false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>Subject Add</legend>
|
||||
|
||||
<div class="panel-body" >
|
||||
|
||||
|
||||
|
||||
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.Semester.$dirty && Form.Semester.$invalid,'has-success':Form.Semester.$valid}">
|
||||
<label>
|
||||
Sem/Year
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Sem/year"
|
||||
tabindex="4" class="form-control" name="Semester"
|
||||
ng-model="myModelSemYear1.Semester" ng-pattern="" required>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Semester.$dirty && Form.Semester.$error.required">Sem/Year is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Semester.$dirty && Form.Semester.$error.pattern">Invalid Sem/Year name </span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.SubjectCode.$dirty && Form.SubjectCode.$invalid,'has-success':Form.SubjectCode.$valid}">
|
||||
<label>
|
||||
Subject Code
|
||||
@ -144,7 +19,7 @@
|
||||
|
||||
<input type="text" placeholder="Enter Subject Code"
|
||||
autofocus tabindex="7" class="form-control" name="SubjectCode"
|
||||
ng-model="myModelSemYear1.SubjectCode" ng-pattern="" required />
|
||||
ng-model="p.SubjectCode" ng-pattern="" required />
|
||||
<span class="error text-small block"
|
||||
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">SubjectCode is required</span>
|
||||
@ -152,7 +27,7 @@
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid SubjectCode</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid,'has-success':Form.SubjectName.$valid}">
|
||||
<label>
|
||||
Subject Name
|
||||
@ -162,99 +37,34 @@
|
||||
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
tabindex="6" class="form-control" name="SubjectName"
|
||||
ng-model="myModelSemYear1.SubjectName" ng-pattern="" required />
|
||||
ng-model="p.SubjectName" ng-pattern="" required />
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required">Sem/Year is required</span>
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required">SubjectName is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name </span>
|
||||
</div>
|
||||
<!-- <div class="col-md-3">
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-switch="myModel.switchsetting">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
<div ng-if="p.IsActive==true">
|
||||
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="p.IsActive==false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
|
||||
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<input type="button" class="btn btn-sm btn-info" title="Click to add one more subject items" value="Add More" ng-click="updateMoreFeesItems(myModelSemYear1,Form)"/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-repeat="n in updateMoreItems" >
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Semester==undefined, 'has-success':n.Semester!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Semester"
|
||||
class="form-control" name="Semester{{$index}}"
|
||||
ng-model="n.Semester" required/>
|
||||
<span class="error text-small block" ng-if="n.Semester==undefined">Enter a valid name</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.SubjectCode==undefined, 'has-success':n.SubjectCode!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject Name"
|
||||
autofocus class="form-control" name="SubjectCode{{$index}}"
|
||||
ng-model="n.SubjectCode" required/>
|
||||
<span class="error text-small block" ng-if="n.SubjectCode==undefined">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.SubjectName==undefined, 'has-success':n.SubjectName!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
class="form-control" name="subjectName{{$index}}"
|
||||
ng-model="n.SubjectName" required/>
|
||||
<span class="error text-small block" ng-if="n.SubjectName==undefined">Enter a subject valid name</span>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateSubject(p,Form,myModelSemYear1,'zoom-in')">
|
||||
<button type="submit" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateSubject(p,Form,'zoom-in')">
|
||||
Save
|
||||
</button>
|
||||
|
||||
|
||||
@ -87,6 +87,11 @@
|
||||
<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
<li ui-sref-active="active" >
|
||||
<a ui-sref="app.master.sessionMaster">
|
||||
<span class="title" translate="sidebar.nav.master.SESSIONMASTER"> SESSION DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
@ -372,6 +377,11 @@
|
||||
<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
<li ui-sref-active="active" >
|
||||
<a ui-sref="app.master.sessionMaster">
|
||||
<span class="title" translate="sidebar.nav.master.SESSIONMASTER"> SESSION DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
210
Apollo/assets/views/sessionMaster.html
Normal file
210
Apollo/assets/views/sessionMaster.html
Normal file
@ -0,0 +1,210 @@
|
||||
<style>
|
||||
b.fa {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px #007AFF;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
<!-- start: PAGE TITLE -->
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="Session"></h1>
|
||||
|
||||
<span class="mainDescription">Add/View Session Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
<div class="row" ng-controller="sessionMasterCtrl" data-ng-init="init()">
|
||||
<tabset class="tabbable">
|
||||
<tab heading="View Session" id="viewSession">
|
||||
<div class="container-fluid container-fullw">
|
||||
<div class="row">
|
||||
<div ng-if="loader == ''" class="col-md-12" align="center">
|
||||
<!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
|
||||
<spinner name="html5spinner"> <div class="overlay"></div> <div class="spinner"> <div class="double-bounce1"></div> <div class="double-bounce2"></div> </div> <div class="please-wait">Please Wait...</div>
|
||||
</spinner>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" ng-if="emptyData == false && loader != ''" style="min-height: 281px;">
|
||||
<p style="color: red;" align="center"><strong><h3 class="text-center">oops! No
|
||||
records found... </h3></strong></p>
|
||||
</div>
|
||||
<div class="col-md-12" ng-if="emptyData == true">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-3">
|
||||
<script>
|
||||
$(function () {
|
||||
$("#search").focus();
|
||||
|
||||
});
|
||||
</script>
|
||||
<input class="form-control" type="text" ng-model="search"
|
||||
id="search" autofocus tabindex="1"
|
||||
placeholder="Search"/><br><br>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="table-responsive">
|
||||
<fieldset>
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('SessionName')">Session Name
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='SessionName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
<th>Status</th>
|
||||
<th> Action</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
<!-- <pre>p|json</pre> -->
|
||||
<tr>
|
||||
<td>{{p.SessionName}}</td>
|
||||
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">In-Active</span></td>
|
||||
<td>
|
||||
|
||||
<a class="text-azure" id="editRowBtn{{p.SessionID}}" ng-click="setEditId(p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr ng-show="editId === p.SessionID" ng-if="editId === p.SessionID" >
|
||||
<td colspan="6" ng-include src="'assets/views/editSessionMaster.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
</tab>
|
||||
<script>
|
||||
$('#addSession').click(function () {
|
||||
$('#sessionName').focus();
|
||||
});
|
||||
$('#viewSession').click(function () {
|
||||
$('#search').focus();
|
||||
});
|
||||
</script>
|
||||
|
||||
<tab heading="Add Session" id="addSession">
|
||||
<div>
|
||||
<form name="Form" id="form" novalidate ng-submit="sessionForm.submit(Form, myModel, 'zoom-in')" method="post">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Add New Session Details
|
||||
</legend>
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.sessionName.$dirty && Form.sessionName.$invalid, 'has-success':Form.sessionName.$valid}">
|
||||
<label>
|
||||
Session Name <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Session Name"
|
||||
tabindex="2" class="form-control" name="sessionName" id="sessionName"
|
||||
ng-model="myModel.sessionName" ng-pattern="" required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.sessionName.$dirty && Form.sessionName.$error.required">Session name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.sessionName.$dirty && Form.sessionName.$error.pattern">Invalid session name </span>
|
||||
<!--<span class="success text-small"-->
|
||||
<!--ng-if="Form.sessionName.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid && myModel.universityName.length==0, 'has-success':Form.university.$valid}">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<!-- <select class="form-control" name="university" tabindex="3" id="university"
|
||||
ng-model="myModel.universityName"
|
||||
ng-options="details.UniversityID as details.UniversityName for details in university"
|
||||
required>
|
||||
<option value=""> Select University</option>
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.university.$dirty && Form.university.$invalid">University is required</span>-->
|
||||
<!--<span class="success text-small" ng-if="Form.university.$valid">Thank You!</span>-->
|
||||
|
||||
<ui-select multiple ng-model="myModel.universityName" tabindex="3">
|
||||
<ui-select-match placeholder="Select University">
|
||||
{{$item.UniversityName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices
|
||||
repeat="d in universityList | filter:$select.search">
|
||||
{{d.UniversityName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
|
||||
<input class="ng-hide" type="text" name="university"
|
||||
ng-model="myModel.universityName"
|
||||
required>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.university.$dirty && Form.university.$error.required && myModel.universityName.length==0">University is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading1.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
|
||||
Add
|
||||
</button>
|
||||
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="5"
|
||||
ng-click="sessionForm.reset(Form)">
|
||||
Reset
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
</tabset>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end: LIST GROUP -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px #007AFF;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
<!-- start: PAGE TITLE -->
|
||||
@ -33,87 +33,81 @@
|
||||
<spinner name="html5spinner"> <div class="overlay"></div> <div class="spinner"> <div class="double-bounce1"></div> <div class="double-bounce2"></div> </div> <div class="please-wait">Please Wait...</div>
|
||||
</spinner>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-12" ng-if="emptyData == false && loader != ''" style="min-height: 281px;">
|
||||
<p style="color: red;" align="center"><strong><h3 class="text-center">oops! No
|
||||
records found... </h3></strong></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" ng-if="emptyData == true">
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<script>
|
||||
$(function () {
|
||||
$("#search").focus();
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
<input class="form-control" type="text" ng-model="search"
|
||||
id="search" autofocus tabindex="1"
|
||||
placeholder="Search"/><br><br>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<fieldset>
|
||||
|
||||
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('UniversityName')">UniversityName
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='UniversityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
<th ng-click="sort('SubjectCode')">Subject Code
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='SubjectCode'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
<th ng-click="sort(Course)">Course Name
|
||||
<th ng-click="sort(SubjectName)">Subject Name
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Course'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
<th ng-click="sort('Batch')">Batch
|
||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Batch'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||
</th>
|
||||
|
||||
<th>Status</th>
|
||||
|
||||
<th></th>
|
||||
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||
<tr>
|
||||
<!-- <pre>{{data| json}}</pre> -->
|
||||
<td>{{p.UniversityName}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td>{{p.BatchName}}</td>
|
||||
<!-- <td>{{p.SubjectName}}</td> -->
|
||||
|
||||
<td>{{p.SubjectCode}}</td>
|
||||
<td>{{p.SubjectName}}</td>
|
||||
|
||||
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
|
||||
<td>
|
||||
<a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p.ID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
<a class="text-azure" id="editRowBtn{{p.SubjectID}}" ng-click="setEditId(p.SubjectID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
|
||||
</td>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</tr>
|
||||
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
|
||||
<tr ng-show="editId === p.SubjectID" ng-if="editId === p.SubjectID">
|
||||
<td colspan="12" ng-include
|
||||
src="'assets/views/editSubjectDetails.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!--
|
||||
view tab end
|
||||
-->
|
||||
@ -123,265 +117,101 @@
|
||||
$('#batch').focus();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
<tab heading="Add Subject" id="addbatch">
|
||||
<form name="Form" id="form" novalidate ng-submit="subjectFORM.submit(Form, myModel,myModelSemYear, 'zoom-in',addMoreItems)" method="post">
|
||||
<form name="Form" id="form" novalidate ng-submit="subjectFORM.submit(Form, myModel, 'zoom-in')" method="post">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<!-- -->
|
||||
<fieldset>
|
||||
<legend>
|
||||
Subject
|
||||
Subject
|
||||
</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid, 'has-success':Form.university.$valid}">
|
||||
<label for="form-field-select-2">
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="25" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.university"
|
||||
ng-change="onSlecetUnivAdd()" required>
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option ng-repeat="item in universityData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
|
||||
</select>
|
||||
<span class="error text-small block" ng-if="Form.university.$dirty && Form.university.$error.required">University is Required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.SubjectCode.$dirty && Form.SubjectCode.$invalid,'has-success':Form.SubjectCode.$valid}">
|
||||
<label>
|
||||
Subject Code
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject Code"
|
||||
autofocus tabindex="7" class="form-control" name="SubjectCode"
|
||||
ng-model="myModel.SubjectCode" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required />
|
||||
<span class="error text-small block"
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.course.$dirty && Form.course.$invalid, 'has-success':Form.course.$valid}">
|
||||
|
||||
<label>
|
||||
Course <span class="symbol required"></span>
|
||||
</label>
|
||||
<div ng-if="courseLoading == true">
|
||||
<span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
|
||||
</div>
|
||||
<div ng-if="courseLoading == false">
|
||||
<select class="form-control" tabindex="26" name="course" ng-model="myModel.course" class="cs-select cs-skin-elastic"
|
||||
required>
|
||||
<option value="" disabled selected>Select Course</option>
|
||||
<option ng-repeat="item in courseDataAdd" value="{{item.CourseID}}">{{item.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="Form.course.$dirty && Form.course.$error.required">Course is required</span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.batch.$dirty && Form.batch.$invalid, 'has-success':Form.batch.$valid}">
|
||||
|
||||
<label>
|
||||
Batch <span class="symbol required"></span>
|
||||
</label>
|
||||
<div ng-if="courseLoading == true">
|
||||
<span style="padding: auto 0; color: #007AFF; font-weight: bold;">fetching...</span>
|
||||
</div>
|
||||
<div ng-if="courseLoading == false">
|
||||
<select class="form-control" tabindex="26" name="batch" ng-model="myModel.batch" class="cs-select cs-skin-elastic"
|
||||
required>
|
||||
<option value="" disabled selected>Select Batch</option>
|
||||
<option ng-repeat="item in batchDataAdd" value="{{item.BatchCode}}">{{item.BatchName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<span class="error text-small block" ng-if="Form.batch.$dirty && Form.batch.$error.required">Batch is required</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.Comments.$dirty && Form.Comments.$invalid}">
|
||||
<label>
|
||||
Comments
|
||||
</label>
|
||||
<textarea placeholder="Enter Comment" tabindex="15" class="form-control textdsc" name="Comment" ng-model="myModel.Comment"></textarea>
|
||||
<span class="error text-small block" ng-if="Form.Comments.$dirty && Form.Comments.$invalid">Comments is required</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>Subject Add</legend>
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">Subject Code is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid SubjectCode</span>
|
||||
|
||||
<div class="panel-body" >
|
||||
|
||||
|
||||
|
||||
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.Semester.$dirty && Form.Semester.$invalid,'has-success':Form.Semester.$valid}">
|
||||
<label>
|
||||
Sem/Year
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Sem/year"
|
||||
tabindex="4" class="form-control" name="Semester"
|
||||
ng-model="myModelSemYear.Semester" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Semester.$dirty && Form.Semester.$error.required">Semester is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.Semester.$dirty && Form.Semester.$error.pattern">Invalid Semester name </span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.SubjectCode.$dirty && Form.SubjectCode.$invalid,'has-success':Form.SubjectCode.$valid}">
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid,'has-success':Form.SubjectName.$valid}">
|
||||
<label>
|
||||
Subject Code
|
||||
Subject Name
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject Code"
|
||||
autofocus tabindex="7" class="form-control" name="SubjectCode"
|
||||
ng-model="myModelSemYear.SubjectCode" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required />
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
tabindex="6" class="form-control" name="SubjectName"
|
||||
ng-model="myModel.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required />
|
||||
<span class="error text-small block"
|
||||
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">SubjectCode is required</span>
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required"> Subject Name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid SubjectCode</span>
|
||||
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name </span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid,'has-success':Form.SubjectName.$valid}">
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Subject Name
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-switch="myModel.switchsetting">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
tabindex="6" class="form-control" name="SubjectName"
|
||||
ng-model="myModelSemYear.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required />
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required">Sem/Year is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name </span>
|
||||
</div>
|
||||
<!-- <div class="col-md-3">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-switch="myModel.switchsetting">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<input type="button" class="btn btn-sm btn-info" title="Click to add one more subject items" value="Add More" ng-click="addMoreFeesItems(myModelSemYear,Form)"/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" ng-repeat="n in addMoreItems">
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.Semester==undefined, 'has-success':n.Semester!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Sem/year"
|
||||
class="form-control" name="Semester{{$index}}"
|
||||
ng-model="n.Semester" required/>
|
||||
<span class="error text-small block" ng-if="n.Semester==undefined">Enter a valid name</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.SubjectCode==undefined, 'has-success':n.SubjectCode!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject Name"
|
||||
autofocus class="form-control" name="SubjectCode{{$index}}"
|
||||
ng-model="n.SubjectCode" required/>
|
||||
<span class="error text-small block" ng-if="n.SubjectCode==undefined">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':n.SubjectName==undefined, 'has-success':n.SubjectName!=undefined}">
|
||||
<label>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
class="form-control" name="subjectName{{$index}}"
|
||||
ng-model="n.SubjectName" required/>
|
||||
<span class="error text-small block" ng-if="n.SubjectName==undefined">Enter a subject valid name</span>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ng-disabled="disableButton" tabindex="30" class="btn btn-wide btn-success"
|
||||
data-style="zoom-in">
|
||||
Submit
|
||||
</button>
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ng-disabled="disableButton" tabindex="30" class="btn btn-wide btn-success"
|
||||
data-style="zoom-in"> Submit </button>
|
||||
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="14" ng-click="subjectFORM.reset(Form);">
|
||||
|
||||
Reset
|
||||
</button>
|
||||
<!-- <button type="reset" tabindex="31" class="btn btn-warning btn-wide" tabindex="9" ng-click="studentFORM.resetCourse(Form)">
|
||||
Reset
|
||||
</button> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="14" ng-click="subjectFORM.reset(Form);">
|
||||
|
||||
Reset
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<!--<pre> {{ myModel | json }}</pre>
|
||||
<pre> {{ myModelCourse | json }}</pre>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</tab>
|
||||
</tabset>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end: LIST GROUP -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user