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

apollo2bancend chabges

Browse Source
This commit is contained in:
gayathri1990 2018-09-21 15:09:06 +05:30
parent c8ec4d9d56
commit 761006242c
13 changed files with 84 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/database.php
View File

@ -78,7 +78,7 @@ $db['default'] = array(
'hostname' => 'apollodec.com', 'hostname' => 'apollodec.com',
'username' => 'apollod4_DEV', 'username' => 'apollod4_DEV',
'password' => 'apollo1234', 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev', 'database' => 'apollod4_ApolloSCDEV',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,

1
api/application/config/routes.php
View File

@ -57,3 +57,4 @@ $route['login'] = 'Login_Controller/login';
$route['getBranchDetails'] = 'Branch_Controller/getBranchDetails'; $route['getBranchDetails'] = 'Branch_Controller/getBranchDetails';
$route['fileUpload'] = 'Branch_Controller/uploadFiles'; $route['fileUpload'] = 'Branch_Controller/uploadFiles';
$route['addFees'] = 'Masters_Controller/add_fees'; $route['addFees'] = 'Masters_Controller/add_fees';
//$route['getFees'] = 'Masters_Controller/get_fees';

8
api/application/controllers/Login_Controller.php
View File

@ -45,11 +45,11 @@ class Login_Controller extends REST_Controller {
{ {
// generate token // generate token
$tokenData = array(); $tokenData = array();
$tokenData['ID'] = $loginDetails['details']->ID; // $tokenData['ID'] = $loginDetails['details']->ID;
$tokenData['UserType'] = $loginDetails['details']->ListCode; // $tokenData['UserType'] = $loginDetails['details']->ListCode;
$tokenData['MobileNumber'] = $loginDetails['details']->MobileNumber; $tokenData['MobileNumber'] = $loginDetails['details']->MobileNumber;
$tokenData['BranchCode'] = $loginDetails['details']->BranchCode; //$tokenData['BranchCode'] = $loginDetails['details']->BranchCode;
$tokenData['Admin'] = $loginDetails['details']->BranchCode; //$tokenData['Admin'] = $loginDetails['details']->BranchCode;
$tokenData['iat'] = strtotime("now"); $tokenData['iat'] = strtotime("now");
$tokenData['exp'] = strtotime("+30 days"); $tokenData['exp'] = strtotime("+30 days");
//$tokenData['timestamp'] = strtotime("+2 hours"); //$tokenData['timestamp'] = strtotime("+2 hours");

65
api/application/controllers/Masters_Controller.php
View File

@ -26,57 +26,32 @@ class Masters_Controller extends REST_Controller {
// Configure limits on our controller methods // Configure limits on our controller methods
// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php // 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->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 //This method used to get Login
public function add_fees_post() public function add_fees_post()
{ {
echo 'hai';
// $data = json_decode(file_get_contents('php://input'), true); $data = json_decode(file_get_contents('php://input'), true);
// //echo "function in"; $feesdes = $data['Feesdes'];
$active = $data['active'];
// $feesdes = $data['Feesdes']; $feesName = $data['feesName'];
// $active = $data['active']; $feesdetails= array('FeesName'=>$feesName,'FeesDescription'=>$feesdes,'Active'=>$active);
// $feesName = $data['feesName']; $res = $this->master_model->addfees($feesdetails);
// $feesdetails= array('FeesDescription'=>$feesdes,'FeesName'=>$feesName,'IsActive'=>$active); return $res;
// $res = $this->master_model->addfees($feesdetails); }
// echo $feesdes.'----'.$active.'----'.$feesName;
//echo $userMobile;die; public function get_fees_get()
// //echo $userMobile;die; {
// $password = $this->post('password');
$data = json_decode(file_get_contents('php://input'), true);
// $loginDetails = $this->login_model->login( $userMobile, $password);// Check if the users data store contains users (in case the database result returns NULL) $getfees = $this->master_model->getfees();
// //print_r($loginDetails);die; //print_r($getfees);
// if ($loginDetails['loginStatus']) return $getfees;
// { }
// // 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
// ]);
// }
}
} }

0
api/application/hooks/LanguageLoader.php → api/application/core/hooks/LanguageLoader.php
View File

0
api/application/hooks/index.html → api/application/core/hooks/index.html
View File

14
api/application/models/master_model.php
View File

@ -22,12 +22,22 @@ class master_model extends CI_Model
public function addfees($feesdetails) public function addfees($feesdetails)
{ {
echo 'hai';
$this->db->insert('a_feesmaster',$feesdetails); $this->db->insert('T_AFeesDetails',$feesdetails);
$r = $this->db->affected_rows(); $r = $this->db->affected_rows();
return $r; 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) public function login($mobile = null, $password = null)
{ {
//echo $mobile;die; //echo $mobile;die;

15
e2e/app/apolloservice.service.spec.ts Normal file
View File

@ -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();
}));
});

9
e2e/app/apolloservice.service.ts Normal file
View File

@ -0,0 +1,9 @@
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root'
})
export class ApolloserviceService {
constructor() { }
}

6
package-lock.json generated
View File

@ -8211,9 +8211,9 @@
} }
}, },
"rxjs": { "rxjs": {
"version": "6.2.2", "version": "6.3.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.2.tgz",
"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", "integrity": "sha512-hV7criqbR0pe7EeL3O66UYVg92IR0XsA97+9y+BWTePK9SKmEI5Qd3Zj6uPnGkNzXsBywBQWTvujPl+1Kn9Zjw==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }

2
package.json
View File

@ -30,7 +30,7 @@
"moment": "2.18.1", "moment": "2.18.1",
"ng2-charts": "1.6.0", "ng2-charts": "1.6.0",
"ngx-bootstrap": "^3.0.1", "ngx-bootstrap": "^3.0.1",
"rxjs": "^6.2.1", "rxjs": "^6.3.2",
"ts-helpers": "1.1.2", "ts-helpers": "1.1.2",
"zone.js": "^0.8.26" "zone.js": "^0.8.26"
}, },

4
src/app/views/masters/fees-master/fees-master.component.html
View File

@ -1,5 +1,7 @@
<div class="alert alert-dark" id="feesalert" role="alert">
It's dark alert!
</div>
<!--/.row--> <!--/.row-->
<div class="row"> <div class="row">
<!--/.col--> <!--/.col-->

50
src/app/views/masters/fees-master/fees-master.component.ts
View File

@ -20,7 +20,7 @@ export class FeesMasterComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.getfees();
} }
onSubmit() { onSubmit() {
@ -29,54 +29,34 @@ export class FeesMasterComponent implements OnInit {
//var fees = JSON.stringify(this.model); //var fees = JSON.stringify(this.model);
this.feessend(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){ 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'}); let header =new Headers({'content-Type':'apploication/json','Token':Token,'Authorization':'apollo123'});
alert(header);
let options = new RequestOptions({headers: header}); let options = new RequestOptions({headers: header});
alert(options);
this.http.post(this.api+'addFees',fees,options).pipe(map(data => {})).subscribe(result => { 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);
});
}
} }