diff --git a/api/application/config/database.php b/api/application/config/database.php index 46c04b2..55f9663 100644 --- a/api/application/config/database.php +++ b/api/application/config/database.php @@ -78,7 +78,7 @@ $db['default'] = array( 'hostname' => 'apollodec.com', 'username' => 'apollod4_DEV', 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'database' => 'apollod4_ApolloSCDEV', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 5c523d5..57f22b7 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -57,3 +57,4 @@ $route['login'] = 'Login_Controller/login'; $route['getBranchDetails'] = 'Branch_Controller/getBranchDetails'; $route['fileUpload'] = 'Branch_Controller/uploadFiles'; $route['addFees'] = 'Masters_Controller/add_fees'; +//$route['getFees'] = 'Masters_Controller/get_fees'; diff --git a/api/application/controllers/Login_Controller.php b/api/application/controllers/Login_Controller.php index 8edd6ed..d9c0292 100644 --- a/api/application/controllers/Login_Controller.php +++ b/api/application/controllers/Login_Controller.php @@ -45,11 +45,11 @@ class Login_Controller extends REST_Controller { { // generate token $tokenData = array(); - $tokenData['ID'] = $loginDetails['details']->ID; - $tokenData['UserType'] = $loginDetails['details']->ListCode; + // $tokenData['ID'] = $loginDetails['details']->ID; + // $tokenData['UserType'] = $loginDetails['details']->ListCode; $tokenData['MobileNumber'] = $loginDetails['details']->MobileNumber; - $tokenData['BranchCode'] = $loginDetails['details']->BranchCode; - $tokenData['Admin'] = $loginDetails['details']->BranchCode; + //$tokenData['BranchCode'] = $loginDetails['details']->BranchCode; + //$tokenData['Admin'] = $loginDetails['details']->BranchCode; $tokenData['iat'] = strtotime("now"); $tokenData['exp'] = strtotime("+30 days"); //$tokenData['timestamp'] = strtotime("+2 hours"); diff --git a/api/application/controllers/Masters_Controller.php b/api/application/controllers/Masters_Controller.php index 8b919ba..6c7f952 100644 --- a/api/application/controllers/Masters_Controller.php +++ b/api/application/controllers/Masters_Controller.php @@ -26,57 +26,32 @@ class Masters_Controller extends REST_Controller { // Configure limits on our controller methods // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php $this->methods['add_fees_post']['limit'] = 100; // 100 requests per hour per user/key - //$this->load->model('Login_model', 'login_model'); + $this->methods['get_fees_get']['limit'] = 100; + $this->load->model('master_model', 'master_model'); } //This method used to get Login public function add_fees_post() { - echo 'hai'; - // $data = json_decode(file_get_contents('php://input'), true); - // //echo "function in"; - - // $feesdes = $data['Feesdes']; - // $active = $data['active']; - // $feesName = $data['feesName']; - // $feesdetails= array('FeesDescription'=>$feesdes,'FeesName'=>$feesName,'IsActive'=>$active); - // $res = $this->master_model->addfees($feesdetails); - // echo $feesdes.'----'.$active.'----'.$feesName; - //echo $userMobile;die; - // //echo $userMobile;die; - // $password = $this->post('password'); - - // $loginDetails = $this->login_model->login( $userMobile, $password);// Check if the users data store contains users (in case the database result returns NULL) - // //print_r($loginDetails);die; - // if ($loginDetails['loginStatus']) - // { - // // generate token - // $tokenData = array(); - // $tokenData['ID'] = $loginDetails['details']->ID; - // $tokenData['UserType'] = $loginDetails['details']->ListCode; - // $tokenData['MobileNumber'] = $loginDetails['details']->MobileNumber; - // $tokenData['BranchCode'] = $loginDetails['details']->BranchCode; - // $tokenData['Admin'] = $loginDetails['details']->BranchCode; - // $tokenData['iat'] = strtotime("now"); - // $tokenData['exp'] = strtotime("+2 minutes"); - // //$tokenData['timestamp'] = strtotime("+2 hours"); - // $output['token'] = AUTHORIZATION::generateToken($tokenData); - // // $generate=AUTHORIZATION::validateTimestamp($output['token']); - // // end generate token - // $output['loginStatus'] = true; - // // Set the response and exit - // $this->response($output); - // } - // else - // { - // // Set the response and exit - // $this->response([ - // 'message' => 'No users were found', - // 'loginStatus' => false - // ]); - // } - } + + $data = json_decode(file_get_contents('php://input'), true); + $feesdes = $data['Feesdes']; + $active = $data['active']; + $feesName = $data['feesName']; + $feesdetails= array('FeesName'=>$feesName,'FeesDescription'=>$feesdes,'Active'=>$active); + $res = $this->master_model->addfees($feesdetails); + return $res; + } + + public function get_fees_get() + { + + $data = json_decode(file_get_contents('php://input'), true); + $getfees = $this->master_model->getfees(); + //print_r($getfees); + return $getfees; + } } \ No newline at end of file diff --git a/api/application/hooks/LanguageLoader.php b/api/application/core/hooks/LanguageLoader.php similarity index 100% rename from api/application/hooks/LanguageLoader.php rename to api/application/core/hooks/LanguageLoader.php diff --git a/api/application/hooks/index.html b/api/application/core/hooks/index.html similarity index 100% rename from api/application/hooks/index.html rename to api/application/core/hooks/index.html diff --git a/api/application/models/master_model.php b/api/application/models/master_model.php index 38a8583..bd1aeef 100644 --- a/api/application/models/master_model.php +++ b/api/application/models/master_model.php @@ -22,12 +22,22 @@ class master_model extends CI_Model public function addfees($feesdetails) { - echo 'hai'; - $this->db->insert('a_feesmaster',$feesdetails); + + $this->db->insert('T_AFeesDetails',$feesdetails); $r = $this->db->affected_rows(); return $r; } + public function getfees() + { + + $this->db->select('T_AFeesDetails.FeesName,T_AFeesDetails.FeesDescription,T_AFeesDetails.Active'); + $this->db->from('T_AFeesDetails'); + $result = $this->db->get(); + return $result; + + } + public function login($mobile = null, $password = null) { //echo $mobile;die; diff --git a/e2e/app/apolloservice.service.spec.ts b/e2e/app/apolloservice.service.spec.ts new file mode 100644 index 0000000..e0b78fe --- /dev/null +++ b/e2e/app/apolloservice.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { ApolloserviceService } from './apolloservice.service'; + +describe('ApolloserviceService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ApolloserviceService] + }); + }); + + it('should be created', inject([ApolloserviceService], (service: ApolloserviceService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/e2e/app/apolloservice.service.ts b/e2e/app/apolloservice.service.ts new file mode 100644 index 0000000..fda5fe6 --- /dev/null +++ b/e2e/app/apolloservice.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class ApolloserviceService { + + constructor() { } +} diff --git a/package-lock.json b/package-lock.json index 28ab964..17126b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8211,9 +8211,9 @@ } }, "rxjs": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", - "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.2.tgz", + "integrity": "sha512-hV7criqbR0pe7EeL3O66UYVg92IR0XsA97+9y+BWTePK9SKmEI5Qd3Zj6uPnGkNzXsBywBQWTvujPl+1Kn9Zjw==", "requires": { "tslib": "^1.9.0" } diff --git a/package.json b/package.json index 74c9890..9adb575 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "moment": "2.18.1", "ng2-charts": "1.6.0", "ngx-bootstrap": "^3.0.1", - "rxjs": "^6.2.1", + "rxjs": "^6.3.2", "ts-helpers": "1.1.2", "zone.js": "^0.8.26" }, diff --git a/src/app/views/masters/fees-master/fees-master.component.html b/src/app/views/masters/fees-master/fees-master.component.html index f2900bb..c98c8a7 100644 --- a/src/app/views/masters/fees-master/fees-master.component.html +++ b/src/app/views/masters/fees-master/fees-master.component.html @@ -1,5 +1,7 @@ - +
diff --git a/src/app/views/masters/fees-master/fees-master.component.ts b/src/app/views/masters/fees-master/fees-master.component.ts index a96629a..0a4f03c 100644 --- a/src/app/views/masters/fees-master/fees-master.component.ts +++ b/src/app/views/masters/fees-master/fees-master.component.ts @@ -20,7 +20,7 @@ export class FeesMasterComponent implements OnInit { } ngOnInit() { - + this.getfees(); } onSubmit() { @@ -29,54 +29,34 @@ export class FeesMasterComponent implements OnInit { //var fees = JSON.stringify(this.model); this.feessend(JSON.stringify(this.model)); - // alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.Feesdes)) - // alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.active)) - - // var agesArr = [{a:1}, {a:2}, {a:3}, - // {a:4}]; - - // var roots = agesArr.filter(function(ages){ - // return ages.a>2; - - - // }); - // function root() - // { - // var agAr=[1,2,3,4]; - // var abc = agAr.map(Math.sqrt); - // return abc; - // } + -// var playersArr = [ -// {name: 'Jason', footedness: 'left', position: 'forward'}, -// {name: 'Blake', footedness: 'right', position: 'defense'}, -// {name: 'Philip', footedness: 'right', position: 'goalie'}, -// {name: 'Logan', footedness: 'left', position: 'defense'}, -// {name: 'Will', footedness: 'right', position: 'forward'} -// ]; -// var leftFootArr = playersArr.filter(function(player){ -// return player.footedness === 'right'; -// }); -// console.log(leftFootArr); - - - + } feessend(fees){ - let Token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJJRCI6bnVsbCwiVXNlclR5cGUiOiJSMDA0IiwiTW9iaWxlTnVtYmVyIjoiOTg3NjU0MzIxMCIsIkJyYW5jaENvZGUiOm51bGwsIkFkbWluIjpudWxsLCJpYXQiOjE1MzQzMjU0NDQsImV4cCI6MTUzNjkxNzQ0NH0.v0DDwiImjRq2OwhXFrS0C_CV9B8B4A2ii_Y3qcmFYbQ'; + let Token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJNb2JpbGVOdW1iZXIiOiI5ODc2NTQzMjEwIiwiaWF0IjoxNTM3NDQ4Njg3LCJleHAiOjE1NDAwNDA2ODd9.xQrICK4i-67qziTZee5AWQofHQvynoOLjLrR6PeKlH4'; let header =new Headers({'content-Type':'apploication/json','Token':Token,'Authorization':'apollo123'}); - alert(header); let options = new RequestOptions({headers: header}); - alert(options); this.http.post(this.api+'addFees',fees,options).pipe(map(data => {})).subscribe(result => { }); } + getfees(){ + console.log('hai'); + let Token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJNb2JpbGVOdW1iZXIiOiI5ODc2NTQzMjEwIiwiaWF0IjoxNTM3NDQ4Njg3LCJleHAiOjE1NDAwNDA2ODd9.xQrICK4i-67qziTZee5AWQofHQvynoOLjLrR6PeKlH4'; + let header =new Headers({'content-Type':'apploication/json','Token':Token,'Authorization':'apollo123'}); + let options = new RequestOptions({headers: header}); + return this.http.get(this.api+'getFees',options).pipe(map(data => {})).subscribe(result => { + + console.log(result); + }); + + } }