Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
resicovenba 2018-02-09 15:09:56 +05:30
commit 7b8ac77955
15 changed files with 263 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Apollo/api/application/controllers/Course_Controller.php
View File

@ -58,7 +58,10 @@ class Course_Controller extends REST_Controller {
if($jsonLateralFeesData['FeesAmount'] != 0 AND $jsonLateralFeesData['FeesAmount'] != '' AND $jsonLateralFeesData['FeesAmount'] != 'undefined'){
array_push($jsonSemFeesData,$jsonLateralFeesData);
}
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL)
// get subject details
$subjectDetails=$this->post('subjects');
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData,$subjectDetails);// Check if the users data store contains users (in case the database result returns NULL)
if ($courseDetails)
{
$courseDetails['status'] = REST_Controller::HTTP_OK;
@ -104,8 +107,8 @@ class Course_Controller extends REST_Controller {
}
public function getCourseUnivFeesDetails_post() {
$requestedBy = $this->post('requestedBy');
$getCourseUnivFee = $this->course_model->getCourseUnivFeesTypes($requestedBy);
$requestedBy = $this->post('requestedBy');
$getCourseUnivFee = $this->course_model->getCourseUnivFeesTypes($requestedBy);
if ($getCourseUnivFee)
{
@ -158,7 +161,14 @@ class Course_Controller extends REST_Controller {
}
$updateDetails = $this->course_model->updateCourse($details,$jsonSemFeesData,$existCourseID);// Check if the users data store contains users (in case the database result returns NULL)
// update course subject details
$subjectDetails['UniversityID'] = $this->post('universityID');
$subjectDetails['CourseID'] = $this->post('courseID');
$subjectDetails['Subjects'] = $this->post('subjects');
$subjectDetails['UpdatedBy'] = $this->post('updatedBy');
$subjectDetails['UpdatedOn'] = $now->format('Y-m-d H:i:s');
$updateDetails = $this->course_model->updateCourse($details,$jsonSemFeesData,$subjectDetails);// Check if the users data store contains users (in case the database result returns NULL)
if ($updateDetails)
{
$updateDetails['status'] = REST_Controller::HTTP_OK;

110
Apollo/api/application/models/Course_model.php
View File

@ -15,7 +15,7 @@ class Course_model extends CI_Model {
* created by kms
* */
public function addCourse($arrayDetails=null,$jsonSemFeesData=null)
public function addCourse($arrayDetails=null,$jsonSemFeesData=null,$subjectDetails=null)
{
$this->db->select('CourseCode');
@ -40,6 +40,10 @@ class Course_model extends CI_Model {
$this->db->insert(COURSE_FEES, $insertFeesArray);
}
if($subjectDetails){
$this->insertCourseSubjects($arrayDetails,$insert_id,$subjectDetails);
}
$result['courseStatus'] = true;
$result['message'] = "Successfully course details added";
}
@ -95,6 +99,7 @@ class Course_model extends CI_Model {
$fetchData['UniversityID']=$row->UniversityID;
$fetchData['UniversityName']=$row->UniversityName;
$fetchData['feesStructures'] = $this->getCourseFeesDetails($row->CourseID);
$fetchData['existSubjects'] = $this->getExistCourseSubjectDetails($row->CourseID);
// print_r($fetchData);exit();
$storeCourseArray[]=$fetchData;
}
@ -123,7 +128,7 @@ class Course_model extends CI_Model {
* update course details
* created by kms
* */
public function updateCourse($arrayDetails=null,$jsonData=null)
public function updateCourse($arrayDetails=null,$jsonData=null,$subjectDetails=null)
{
$this->db->select('CourseCode');
$this->db->where('CourseCode', $arrayDetails['CourseCode']);
@ -158,6 +163,9 @@ class Course_model extends CI_Model {
}
}
// update course subject details
$this->updateCourseSubjcetDetails($subjectDetails);
$result['courseStatus'] = true;
$result['message'] = "Successfully course details updated";
@ -261,14 +269,104 @@ class Course_model extends CI_Model {
* created by kms
* */
public function getSubjectDetails(){
$this->db->select('UniversityID,UniversityName');
$this->db->order_by('UniversityID','ASC');
$this->db->select('SubjectID,SubjectCode,SubjectName');
$this->db->order_by('SubjectID','DESC');
$this->db->where('IsActive','1');
$universityDetails = $this->db->get(SUBJE);
return $universityDetails->result();
$subjectDetails = $this->db->get(SUBJECTMASTER);
return $subjectDetails->result();
}
/*
*Insert course sujects
* created by kms
* */
public function insertCourseSubjects($details=null,$courseID=null,$subjects=null){
$insertSubject['UniversityID'] = $details['UniversityID'];
$insertSubject['CourseID'] = $courseID;
if ($subjects){
foreach ($subjects as $row){
$insertSubject['SubjectID'] = $row['SubjectID'];
$insertSubject['IsActive'] = true;
$insertSubject['CreatedBy'] = $details['CreatedBy'];
$insertSubject['CreatedOn'] = $details['CreatedOn'];
$this->db->insert(COURSESUBJECT, $insertSubject);
}
}
return true;
}
/*
* get exist Course subject details
* created by kms
* */
public function getExistCourseSubjectDetails($courseID=null){
$this->db->select('CSU.SubjectID,SM.SubjectCode,SM.SubjectName');
$this->db->order_by('CSID','ASC');
$this->db->where('CSU.CourseID',$courseID);
$this->db->where('CSU.IsActive','1');
$this->db->where('SM.IsActive','1');
$this->db->from(COURSESUBJECT.' as CSU');
$this->db->join(SUBJECTMASTER.' as SM', 'SM.SubjectID = CSU.SubjectID');
$subDetails = $this->db->get();
return $subDetails->result();
}
/*
* update course subject details
* created by kms
* */
public function updateCourseSubjcetDetails($sujects=null){
$deactiveStatus['IsActive']=false;
$deactiveStatus['UpdatedBy']=$sujects['UpdatedBy'];
$deactiveStatus['UpdatedOn']=$sujects['UpdatedOn'];
$this->db->where('CourseID ',$sujects['CourseID']);
$this->db->where('UniversityID ',$sujects['UniversityID']);
$updateCourseSubjectDeactive = $this->db->update(COURSESUBJECT, $deactiveStatus);
if($updateCourseSubjectDeactive){
if($sujects['Subjects']){
foreach ($sujects['Subjects'] as $srow){
$this->db->select('CSID');
$this->db->where('CourseID',$sujects['CourseID']);
$this->db->where('UniversityID',$sujects['UniversityID']);
$this->db->where('SubjectID',$srow);
if($this->db->get(COURSESUBJECT)->first_row()){
$existStatusUpdate['IsActive']=true;
$existStatusUpdate['UpdatedBy']=$sujects['UpdatedBy'];
$existStatusUpdate['UpdatedOn']=$sujects['UpdatedOn'];
$this->db->where('CourseID',$sujects['CourseID']);
$this->db->where('UniversityID',$sujects['UniversityID']);
$this->db->where('SubjectID',$srow);
$this->db->update(COURSESUBJECT, $existStatusUpdate);
}
else{
$update_array["UniversityID"]=$sujects['UniversityID'];
$update_array["CourseID"]=$sujects['CourseID'];
$update_array["SubjectID"]=$srow;
$update_array["IsActive"]=true;
$update_array["CreatedBy"]=$sujects['UpdatedBy'];
$update_array["CreatedOn"]=$sujects['UpdatedOn'];
$this->db->insert(COURSESUBJECT, $update_array);
}
}
}
/* else{
$activateStatus['IsActive']=true;
$this->db->where('CourseID ',$sujects['CourseID']);
$this->db->where('UniversityID ',$sujects['UniversityID']);
$this->db->update(COURSESUBJECT, $activateStatus);
}*/
}
return true;
}
}

29
Apollo/api/application/models/Subject_model.php
View File

@ -15,12 +15,12 @@ class Subject_model extends CI_Model
$this->db->select('SubjectCode');
$this->db->where('SubjectCode',$arrayDetails['SubjectCode']);
if($this->db->get('T_SubjectMaster')->first_row()){
if($this->db->get(SUBJECTMASTER)->first_row()){
$result['SubjectStatus']=false;
$result['message']="This subject code already exists";
}else{
$this->db->insert('T_SubjectMaster',$arrayDetails);
$this->db->insert(SUBJECTMASTER,$arrayDetails);
if ($this->db->affected_rows() == '1') {
$result['SubjectStatus']=true;
@ -45,12 +45,12 @@ 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()){
if($this->db->get(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);
$upateStatus=$this->db->update(SUBJECTMASTER, $arrayDetails);
@ -82,7 +82,7 @@ public function updateSubject($arrayDetails=null,$SubjectID=null)
{
$this->db->select('*');
$this->db->order_by('CreatedOn','DESC');
$subjectDetails = $this->db->get('T_SubjectMaster');
$subjectDetails = $this->db->get(SUBJECTMASTER);
if($subjectDetails->result()){
@ -99,23 +99,4 @@ public function updateSubject($arrayDetails=null,$SubjectID=null)
}
}

3
Apollo/assets/i18n/en.json
View File

@ -72,7 +72,8 @@
"DAYBOOKMASTER":"INCOME/EXPENSE HEADS",
"CENTERMASTER": "CENTER DETAILS",
"SUBJECTMASTER":"SUBJECT MASTER",
"SESSIONMASTER":"SESSION DETAILS"
"SESSIONMASTER":"SESSION DETAILS",
"SESSIONSCHEDULE": "SESSION SCHEDULE"
},
"student": {
"MAIN": "STUDENTS",

3
Apollo/assets/js/config.constant.js
View File

@ -165,7 +165,10 @@ app.constant('JS_REQUIRES', {
'centerCtrl':'assets/js/controllers/centerCtrl.js',
//SUBJECT MASTER
'subjectCtrl':'assets/js/controllers/subjectCtrl.js',
// session master
'sessionMasterCtrl':'assets/js/controllers/sessionMasterCtrl.js',
// session sechdule
'sessionScheduleCtrl':'assets/js/controllers/sessionScheduleCtrl.js',
//*** Filters

8
Apollo/assets/js/config.router.js
View File

@ -228,6 +228,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'Session Master'
},
}).state('app.master.sessionSchedule', {
url: '/session schedule',
templateUrl: "assets/views/sessionSchedule.html",
resolve: loadSequence('ui.select','sessionScheduleCtrl','ngTable', 'ladda', 'angular-ladda','spin'),
title: 'Session Schedule',
ncyBreadcrumb: {
label: 'Session Schedule'
},
}).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>',

29
Apollo/assets/js/controllers/courseCtrl.js
View File

@ -85,6 +85,17 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
}
});
// get exist subject details
$scope.editSubject = [];
angular.forEach(p.existSubjects, function (values, keys) {
$scope.editSubject.push(values.SubjectID);
})
$scope.viewSubject = {
list: $scope.editSubject,
}
$scope.editId = pid;
};
@ -173,7 +184,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
semFeesAmounts:$scope.addMoreItems,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
specilization1:myModel.specilization1,
specilization2:myModel.specilization2
specilization2:myModel.specilization2,
subjects:myModel.subject
}
};
$http(addCourse).then(function (response) {
@ -206,7 +218,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
* update the course details
* created by kms
* */
$scope.updateCourse = function (myModel, form,regular,lateral,semYear, loading) {
$scope.updateCourse = function (myModel, form,regular,lateral,semYear, loading,subjects) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -246,6 +258,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
},
data: {
courseID: myModel.CourseID,
universityID: myModel.UniversityID,
courseCode: myModel.CourseCode,
courseName: myModel.CourseName,
provFess:myModel.PC,
@ -261,7 +274,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
specilization1:myModel.Specilization1,
specilization2:myModel.Specilization2,
existCourseID:myModel.CourseID
existCourseID:myModel.CourseID,
subjects:subjects.list
}
};
$http(update).then(function (response) {
@ -374,6 +388,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
};
function getUniversity_FeesDetails() {
$scope.subjectDetails=[];
var getCourseUnivFee = {
method: 'POST',
url: apiPoint.url + 'getCourseUnivFeesDetails/',
@ -388,11 +403,19 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
if (response.data.status==200 && response.data.courseStatus) {
$scope.university=response.data.universityDetails;
$scope.subjectDetails=[];
$scope.feesDetails=response.data.feesDetails;
$scope.myModel.ListName=$scope.feesDetails[0];
$scope.myModel.programListName=$scope.myModel.ListName.programType[0].ListCode;
angular.forEach(response.data.subjectetails, function (values, keys) {
$scope.subData = {
SubjectID: values.SubjectID,
SubjectName: values.SubjectCode +'-'+values.SubjectName
};
$scope.subjectDetails.push($scope.subData);
})
// single sitting regular course details in model
$scope.myModelRegular = {

8
Apollo/assets/views/centerMaster.html
View File

@ -139,11 +139,11 @@
<input type="text" placeholder="Enter Center Code"
tabindex="1" class="form-control" name="centerCode"
ng-model="myModel.centerCode" ng-pattern="/^[a-zA-Z0-9\s]*$/" required/>
ng-model="myModel.centerCode" ng-pattern="" 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"
ng-if="Form.centerCode.$dirty && Form.centerCode.$error.pattern">Invalid Center Code </span>
ng-if="Form.centerCode.$dirty && Form.centerCode.$error.pattern">Invalid center code </span>
</div>
@ -160,7 +160,7 @@
<span class="error text-small block"
ng-if="Form.centerName.$dirty && Form.centerName.$error.required">Center name is required</span>
<span class="error text-small block"
ng-if="Form.centerName.$dirty && Form.centerName.$error.pattern">Invalid Center name </span>
ng-if="Form.centerName.$dirty && Form.centerName.$error.pattern">Invalid center name </span>
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
</div>
@ -227,7 +227,7 @@
</tabset>
</div>
</div>
<!-- end: LIST GROUP -->
<!-- End: LIST GROUP -->

47
Apollo/assets/views/courseDetails.html
View File

@ -261,8 +261,33 @@
<div class="row">
<div class="col-md-12 form-group">
<label>
Subjects
</label>
<ui-select multiple ng-model="myModel.subject" tabindex="6">
<ui-select-match placeholder="Select Subject">
{{$item.SubjectName}}
</ui-select-match>
<ui-select-choices
repeat="sub in subjectDetails | filter:$select.search">
{{sub.SubjectName}}
</ui-select-choices>
</ui-select>
<input class="ng-hide" type="text" name="subject"
ng-model="myModel.subject"
>
<!--<span class="error text-small block"
ng-if="Form.subject.$dirty && Form.subject.$error.required && myModel.subject.length==0">Subject is required.</span>-->
<!--<span class="success text-small block"-->
</div>
</div>
<div class="row">
@ -280,7 +305,7 @@
</label>
<input type="text" placeholder="Enter Regular Fees Amt"
autofocus tabindex="6" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
autofocus tabindex="7" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
ng-model="myModelRegular.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
<span class="error text-small block"
@ -293,7 +318,7 @@
</label>
<input type="text" placeholder="Enter Lateral Fees Amt"
autofocus tabindex="7" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
autofocus tabindex="8" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
ng-model="myModelLateral.FeesAmount" ng-disabled="myModelRegular.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
<span class="error text-small block"
@ -325,7 +350,7 @@
</label>
<input type="text" placeholder="Enter Sem/year"
tabindex="8" class="form-control" name="sem_year"
tabindex="9" class="form-control" name="sem_year"
ng-model="myModelSemYear.programName" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
@ -339,7 +364,7 @@
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="9" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
ng-model="myModelSemYear.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
<!--<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
@ -398,7 +423,7 @@
</label>
<input type="text" placeholder="Enter Prov Cert Fees"
autofocus tabindex="10" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
ng-model="myModel.provFess" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
@ -414,7 +439,7 @@
</label>
<input type="text" placeholder="Enter transfer Cert Fees"
autofocus tabindex="11" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
ng-model="myModel.transferAmount" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
@ -429,7 +454,7 @@
</label>
<input type="text" placeholder="Enter Degree Cert Fees"
autofocus tabindex="12" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
ng-model="myModel.degreeAmount" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
@ -442,7 +467,7 @@
</label>
<input type="text" placeholder="Enter Migration Cert Fees"
autofocus tabindex="13" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
ng-model="myModel.migrationAmount" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
@ -457,7 +482,7 @@
</label>
<input type="text" placeholder="Enter Other Fees"
autofocus tabindex="14" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
ng-model="myModel.otherAmount" ng-pattern="/^[0-9]*$/">
<span class="error text-small block"
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
@ -473,13 +498,13 @@
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading1.zoom_in" tabindex="15" class="btn btn-wide btn-success" data-style="zoom-in">
<button type="submit" ladda="ldloading1.zoom_in" tabindex="16" class="btn btn-wide btn-success" data-style="zoom-in">
Add
</button>
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit
</button>-->
<button type="reset" class="btn btn-warning btn-wide" tabindex="16" ng-click="courseForm.reset(Form);"
<button type="reset" class="btn btn-warning btn-wide" tabindex="17" ng-click="courseForm.reset(Form);"
ng-click="branchForm.reset(Form)">
Reset
</button>

12
Apollo/assets/views/editCenterDetails.html
View File

@ -9,16 +9,16 @@
<div class="row">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.batchcode.$dirty && Form.batchcode.$invalid, 'has-success':Form.batchcode.$valid}">
ng-class="{'has-error':Form.centercode.$dirty && Form.centercode.$invalid, 'has-success':Form.centercode.$valid}">
<label>
Center Code<span class="symbol required"></span>
</label>
<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]*$/" required/>
ng-model="p.CenterCode" ng-pattern="" required/>
<span class="error text-small block"
ng-if="Form.centercode.$dirty && Form.centercode.$error.required">Center Code is required</span>
ng-if="Form.centercode.$dirty && Form.centercode.$error.required">Center code is required</span>
<span class="error text-small block"
ng-if="Form.centercode.$dirty && Form.centercode.$error.pattern">Invalid center Code </span>
@ -31,13 +31,13 @@
Center Name <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Batch Name"
<input type="text" placeholder="Enter center name"
tabindex="1" class="form-control" name="centerName"
ng-model="p.CenterName" required/>
<span class="error text-small block"
ng-if="Form.centerName.$dirty && Form.centerName.$error.required">Center Code is required</span>
ng-if="Form.centerName.$dirty && Form.centerName.$error.required">Center name is required</span>
<span class="error text-small block"
ng-if="Form.centerName.$dirty && Form.centerName.$error.pattern">Invalid center Code </span>
ng-if="Form.centerName.$dirty && Form.centerName.$error.pattern">Invalid center name </span>
</div>

29
Apollo/assets/views/editCourseDetails.html
View File

@ -124,6 +124,33 @@
<!--ng-if="Form.specilization1.$valid">Thank You!</span>-->
</div>
</div>
<div class="row">
<div class="col-md-12 form-group">
<label>
Subjects
</label>
<ui-select multiple ng-model="viewSubject.list" tabindex="6">
<ui-select-match placeholder="Select Subject">
{{$item.SubjectName}}
</ui-select-match>
<ui-select-choices
repeat="sub.SubjectID as sub in subjectDetails | filter:$select.search">
{{sub.SubjectName}}
</ui-select-choices>
</ui-select>
<input class="ng-hide" type="text" name="subject"
ng-model="viewSubject.list"
>
<!--<span class="error text-small block"
ng-if="Form.subject.$dirty && Form.subject.$error.required && myModel.subject.length==0">Subject is required.</span>-->
<!--<span class="success text-small block"-->
</div>
</div>
<div class="row">
@ -346,7 +373,7 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="16" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateCourse(p,Form,myModelRegular1,myModelLateral1,myModelSemYear1,'zoom-in')">
<button type="submit" ladda="ldloading.zoom_in" tabindex="16" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateCourse(p,Form,myModelRegular1,myModelLateral1,myModelSemYear1,'zoom-in',viewSubject)">
Save
</button>

8
Apollo/assets/views/editSubjectDetails.html
View File

@ -22,9 +22,9 @@
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>
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>
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid subject code</span>
</div>
<div class="col-md-4 form-group"
@ -39,9 +39,9 @@
tabindex="6" class="form-control" name="SubjectName"
ng-model="p.SubjectName" ng-pattern="" required />
<span class="error text-small block"
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required">SubjectName 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.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name </span>
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid subject name </span>
</div>
<div class="col-md-4">
<label>

2
Apollo/assets/views/maps.html
View File

@ -155,7 +155,7 @@
<div id="bodyContent">
<p>
<b>Uluru</b>, also referred to as <b>Ayers Rock</b>, is a large sandstone rock formation in the southern part of the Northern Territory, central Australia.
</p>
</p>s
<p>
Attribution: Uluru,
<a href="//en.wikipedia.org/w/index.php?title=Uluru&amp;oldid=297882194">

16
Apollo/assets/views/partials/nav.html
View File

@ -92,6 +92,11 @@
<span class="title" translate="sidebar.nav.master.SESSIONMASTER"> SESSION DETAILS </span>
</a>
</li>
<li ui-sref-active="active" >
<a ui-sref="app.master.sessionSchedule">
<span class="title" translate="sidebar.nav.master.SESSIONSCHEDULE">SESSION SCHEDULE </span>
</a>
</li>
@ -377,6 +382,17 @@
<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
</a>
</li>
<li ui-sref-active="active" >
<a ui-sref="app.master.centerMaster" >
<span class="title" translate="sidebar.nav.master.CENTERMASTER"> CENTER DETAILS </span>
</a>
</li>
<li ui-sref-active="active" >
<a ui-sref="app.master.subjectMaster">
<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>

12
Apollo/assets/views/subjectMaster.html
View File

@ -138,12 +138,12 @@
<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 />
ng-model="myModel.SubjectCode" ng-pattern="" required />
<span class="error text-small block"
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">Subject Code is required</span>
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>
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid subject code</span>
</div>
<div class="col-md-4 form-group"
@ -156,11 +156,11 @@
<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 />
ng-model="myModel.SubjectName" ng-pattern="" required />
<span class="error text-small block"
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required"> Subject Name 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.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name </span>
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid subject name </span>
</div>
<div class="col-md-4">
<label>