diff --git a/application/controllers/Dashboard_Controller.php b/application/controllers/Dashboard_Controller.php index c4d183d..d98f373 100755 --- a/application/controllers/Dashboard_Controller.php +++ b/application/controllers/Dashboard_Controller.php @@ -52,20 +52,19 @@ class Dashboard_Controller extends BaseController $CountryMasterDatas = array( 'CountryName'=>$this->input->post('CountryName'), 'CapitalCity'=>$this->input->post('CapitalCity'), - 'CountryDescription'=>$this->input->post('Editor')); + 'CountryDescription'=>$this->input->post('Editor'), + 'IsActive'=>$this->input->post('IsActive') != '' ? 1 : 0); $Added = $this->Dashboard_Model->Add_CountryMaster($CountryMasterDatas); - // echo $Added; + if( $Added != "" ){ - // ""; - echo ""; - // redirect ( 'country_master' ); + echo ""; } else { - echo ""; + echo ""; } } @@ -87,20 +86,20 @@ class Dashboard_Controller extends BaseController $CityMasterDatas = array( 'CityName'=>$this->input->post('CityName'), - 'CityDescription'=>$this->input->post('CitiesDescription')); + 'CityDescription'=>$this->input->post('CitiesDescription'), + 'IsActive'=>$this->input->post('IsActive') != '' ? 1 : 0); $Added = $this->Dashboard_Model->Add_CityMaster($CityMasterDatas); - if( $Added >= 1 ){ - echo ""; - redirect ( 'city_master' ); + if( $Added != "" ){ + echo ""; } else { - echo ""; - redirect ( 'city_master' ); + echo ""; } + } @@ -120,20 +119,19 @@ class Dashboard_Controller extends BaseController $VisaTypeMasterDatas = array( 'VisaName'=>$this->input->post('VisaName'), - 'VisaDescription'=>$this->input->post('VisaDescription')); + 'VisaDescription'=>$this->input->post('VisaDescription'), + 'IsActive'=>$this->input->post('IsActive') != '' ? 1 : 0); $Added = $this->Dashboard_Model->Add_VisaType($VisaTypeMasterDatas); - if( $Added >= 1 ){ - echo ""; - redirect ( 'visa_type_master' ); + if( $Added != "" ){ + echo ""; } else { - echo ""; - redirect ( 'visa_type_master' ); - } + echo ""; + } } @@ -155,19 +153,18 @@ class Dashboard_Controller extends BaseController $DocumentMasterDatas = array( 'DocumentName'=>$this->input->post('DocumentName'), 'Document'=>$this->uploadFile(), - 'DocumentDescription'=>$this->input->post('Description')); + 'DocumentDescription'=>$this->input->post('Description'), + 'IsActive'=>$this->input->post('IsActive') != '' ? 1 : 0); $Added = $this->Dashboard_Model->Add_Document($DocumentMasterDatas); - if( $Added >= 1 ){ - echo ""; - + if( $Added != "" ){ + echo ""; } else { - echo ""; - + echo ""; } } diff --git a/application/controllers/Login_Controller.php b/application/controllers/Login_Controller.php index fb5c047..75bfb5f 100755 --- a/application/controllers/Login_Controller.php +++ b/application/controllers/Login_Controller.php @@ -91,7 +91,7 @@ class Login_Controller extends CI_Controller { $this->session->set_flashdata('error', 'Email or password mismatch'); - redirect('/login'); + redirect('/Login_Controller'); } } } @@ -203,7 +203,7 @@ class Login_Controller extends CI_Controller } else { - redirect('/login'); + redirect('/Login_Controller'); } } @@ -249,7 +249,7 @@ class Login_Controller extends CI_Controller setFlashData($status, $message); - redirect("/login"); + redirect("/Login_Controller"); } } } diff --git a/application/models/Dashboard_Model.php b/application/models/Dashboard_Model.php index 8b0d6b7..f9cb21d 100755 --- a/application/models/Dashboard_Model.php +++ b/application/models/Dashboard_Model.php @@ -33,7 +33,7 @@ class Dashboard_Model extends CI_Model{ { $this->db->insert('Tab_CityMaster',$CityMasterDatas); - $CityMaster = $this->db->affected_rows(); + $CityMaster = $this->db->insert_id(); return $CityMaster; } @@ -55,7 +55,7 @@ class Dashboard_Model extends CI_Model{ function Add_VisaType($VisaTypeMasterDatas) { $this->db->insert('Tab_VisaTypeMaster',$VisaTypeMasterDatas); - $VisaTypeMaster = $this->db->affected_rows(); + $VisaTypeMaster = $this->db->insert_id(); return $VisaTypeMaster; } @@ -77,8 +77,7 @@ class Dashboard_Model extends CI_Model{ function Add_Document($DocumentMasterDatas) { $this->db->insert('Tab_Documents',$DocumentMasterDatas); - $Documents = $this->db->affected_rows(); - + $Documents = $this->db->insert_id(); return $Documents; } @@ -92,4 +91,4 @@ class Dashboard_Model extends CI_Model{ } -} \ No newline at end of file +} diff --git a/application/views/city_master.php b/application/views/city_master.php index bd96946..f374a34 100755 --- a/application/views/city_master.php +++ b/application/views/city_master.php @@ -226,8 +226,9 @@ span:nth-child(3) .slide-up:active { CityCode;?> CityName;?> - IsActive == 1 ? 'Active' : 'Deactive' ?> - + IsActive == 1 ? 'Active' : 'Deactive' ?> + + @@ -264,8 +265,16 @@ span:nth-child(3) .slide-up:active { +
-
+
+
+ +
+
+
Or
@@ -295,7 +304,8 @@ span:nth-child(3) .slide-up:active {
- + + - \ No newline at end of file + }); + + diff --git a/application/views/country_master.php b/application/views/country_master.php index 9399bb6..18bdef4 100755 --- a/application/views/country_master.php +++ b/application/views/country_master.php @@ -231,8 +231,9 @@ span:nth-child(3) .slide-up:active { CountryCode;?> CountryName;?> CapitalCity;?> - IsActive == 1 ? 'Active' : 'Deactive' ?> - + IsActive == 1 ? 'Active' : 'Deactive' ?> + + @@ -248,6 +249,7 @@ span:nth-child(3) .slide-up:active { +
@@ -284,7 +286,7 @@ span:nth-child(3) .slide-up:active {
diff --git a/application/views/country_visa_details.php b/application/views/country_visa_details.php index c78d357..d6f9ea0 100755 --- a/application/views/country_visa_details.php +++ b/application/views/country_visa_details.php @@ -710,13 +710,14 @@ span:nth-child(3) .slide-up:active { - Visa Type - Embassy Fee - VFS Fee - Processing Time - Download Form - Download Checklist - Action + Place + Email + Alternate Email + Phone Number + Fax + Submission Timing + Holiday List + Action @@ -909,12 +910,12 @@ span:nth-child(3) .slide-up:active { - Visa Type - Embassy Fee - VFS Fee - Processing Time - Download Form - Download Checklist + City + Phone No + Zip Code + Email + Fax + Address Action @@ -972,5 +973,6 @@ span:nth-child(3) .slide-up:active { //Initialize Select2 Elements $('.select2').select2() }); + diff --git a/application/views/document_upload.php b/application/views/document_upload.php index 331051d..8cc2881 100755 --- a/application/views/document_upload.php +++ b/application/views/document_upload.php @@ -219,8 +219,9 @@ span:nth-child(3) .slide-up:active { DocumentCode;?> DocumentName;?> - IsActive == 1 ? 'Active' : 'Deactive' ?> - + IsActive == 1 ? 'Active' : 'Deactive' ?> + + @@ -267,7 +268,14 @@ span:nth-child(3) .slide-up:active {
-
+
+
+ +
+
+
Or
@@ -311,6 +319,11 @@ span:nth-child(3) .slide-up:active { 'info' : true, 'autoWidth' : false }) + //Flat red color scheme for iCheck + $('input[type="checkbox"].flat-red, input[type="radio"].flat-red').iCheck({ + checkboxClass: 'icheckbox_flat-green', + radioClass : 'iradio_flat-green' + }) }); \ No newline at end of file diff --git a/application/views/login.php b/application/views/login.php index 1609fc6..28e8987 100755 --- a/application/views/login.php +++ b/application/views/login.php @@ -64,7 +64,7 @@ -
-
+
+
+ +
+
+
Or
@@ -305,6 +313,11 @@ span:nth-child(3) .slide-up:active { 'info' : true, 'autoWidth' : false }) + //Flat red color scheme for iCheck + $('input[type="checkbox"].flat-red, input[type="radio"].flat-red').iCheck({ + checkboxClass: 'icheckbox_flat-green', + radioClass : 'iradio_flat-green' + }) }); \ No newline at end of file diff --git a/assets/dist/img/Uploads/hero-bg.jpg b/assets/dist/img/Uploads/hero-bg.jpg new file mode 100644 index 0000000..c146d8b Binary files /dev/null and b/assets/dist/img/Uploads/hero-bg.jpg differ diff --git a/assets/dist/img/Uploads/visa_document.pdf b/assets/dist/img/Uploads/visa_document.pdf old mode 100644 new mode 100755 diff --git a/assets/dist/img/loginbg.jpg b/assets/dist/img/loginbg.jpg new file mode 100644 index 0000000..00e8e16 Binary files /dev/null and b/assets/dist/img/loginbg.jpg differ