USER MGMT ADD LIST
This commit is contained in:
velz
parent
ee4b7b552a
commit
6b9f126901
@ -85,17 +85,98 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat
|
||||
defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
|
||||
|
||||
// define login route name for token verification
|
||||
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getListOfMaster'); // no errors
|
||||
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'login'); // no errors
|
||||
defined('ROUTE_LOGIN2') OR define('ROUTE_LOGIN2', 'login2'); // no errors
|
||||
defined('ROUTE_LOGIN3') OR define('ROUTE_LOGIN3', 'login3'); // no errors
|
||||
|
||||
//AWS resources Constants
|
||||
defined('PROFILEPICTUREBUCKETNAME') OR define('PROFILEPICTUREBUCKETNAME','sineedgedevprofilepic');
|
||||
|
||||
|
||||
|
||||
|
||||
//encript database table name
|
||||
//Define Constants for Table Names and Primarykeys
|
||||
defined('INDUSTRYCLASSIFICATION') OR define('INDUSTRYCLASSIFICATION','m_industry_classification');
|
||||
defined('INDUSTRYCLASSIFICATIONID') OR define('INDUSTRYCLASSIFICATIONID','industry_classification_id');
|
||||
|
||||
defined('PRODUCTS') OR define('PRODUCTS','m_products');
|
||||
defined('PRODUCTSID') OR define('PRODUCTSID','product_id');
|
||||
|
||||
defined('UOM') OR define('UOM','m_uom');
|
||||
defined('UOMID') OR define('UOMID','uom_id');
|
||||
|
||||
defined('SUBPRODUCTS') OR define('SUBPRODUCTS','m_subproducts');
|
||||
defined('SUBPRODUCTSID') OR define('SUBPRODUCTSID','subproduct_id');
|
||||
|
||||
defined('OCCUPATIONMEMBERS') OR define('OCCUPATIONMEMBERS','m_occupation_non_earning_members');
|
||||
defined('OCCUPATIONMEMBERSID') OR define('OCCUPATIONMEMBERSID','occupation_non_earning_member_id');
|
||||
|
||||
defined('TYPEOFACTIVITY') OR define('TYPEOFACTIVITY','m_type_of_activity');
|
||||
defined('TYPEOFACTIVITYID') OR define('TYPEOFACTIVITYID','type_of_activity_id');
|
||||
|
||||
defined('TYPEOFACTIVITY') OR define('TYPEOFACTIVITY','m_type_of_activity');
|
||||
defined('TYPEOFACTIVITYID') OR define('TYPEOFACTIVITYID','type_of_activity_id');
|
||||
|
||||
defined('TITLES') OR define('TITLES','m_titles');
|
||||
defined('TITLESID') OR define('TITLESID','title_id');
|
||||
|
||||
defined('RELATIONSHIPS') OR define('RELATIONSHIPS','m_relationships');
|
||||
defined('RELATIONSHIPSID') OR define('RELATIONSHIPSID','relationship_id');
|
||||
|
||||
defined('FREQUENCY') OR define('FREQUENCY','m_frequency');
|
||||
defined('FREQUENCYID') OR define('FREQUENCYID','frequency_id');
|
||||
|
||||
defined('CUSTOMERBEHAVIOUR') OR define('CUSTOMERBEHAVIOUR','m_customer_behaviour');
|
||||
defined('CUSTOMERBEHAVIOURID') OR define('CUSTOMERBEHAVIOURID','customer_behaviour_id');
|
||||
|
||||
defined('REGIONS') OR define('REGIONS','m_regions');
|
||||
defined('REGIONSID') OR define('REGIONSID','region_id');
|
||||
|
||||
defined('STATE') OR define('STATE','m_states');
|
||||
defined('STATEID') OR define('STATEID','state_id');
|
||||
|
||||
defined('CITY') OR define('CITY','m_city');
|
||||
defined('CITYID') OR define('CITYID','city_id');
|
||||
|
||||
defined('BRANCH') OR define('BRANCH','m_branch');
|
||||
defined('BRANCHID') OR define('BRANCHID','branch_id');
|
||||
|
||||
defined('PDLOCATIONAPPROACH') OR define('PDLOCATIONAPPROACH','m_pd_location_approach');
|
||||
defined('PDLOCATIONAPPROACHID') OR define('PDLOCATIONAPPROACHID','pd_location_approach_id');
|
||||
|
||||
defined('LISTOFMASTERS') OR define('LISTOFMASTERS','m_list_of_masters');
|
||||
defined('LISTOFMASTERSID') OR define('LISTOFMASTERSID','master_id');
|
||||
|
||||
defined('COMMENTSONLOCALITY') OR define('COMMENTSONLOCALITY','m_comments_on_locality');
|
||||
defined('COMMENTSONLOCALITYID') OR define('COMMENTSONLOCALITYID','comments_on_locality_id');
|
||||
|
||||
defined('ENTITYTYPE') OR define('ENTITYTYPE','m_entity_type');
|
||||
defined('ENTITYTYPEID') OR define('ENTITYTYPEID','entity_type_id');
|
||||
|
||||
defined('COMPANY') OR define('COMPANY','m_company');
|
||||
defined('COMPANYID') OR define('COMPANYID','company_id');
|
||||
|
||||
defined('DESIGNATION') OR define('DESIGNATION','m_designation');
|
||||
defined('DESIGNATIONID') OR define('DESIGNATIONID','designation_id');
|
||||
|
||||
defined('LENDERHIERARCHY') OR define('LENDERHIERARCHY','m_lender_hierarchy');
|
||||
defined('LENDERHIERARCHYID') OR define('LENDERHIERARCHYID','lender_hierarchy_id');
|
||||
|
||||
defined('USERPROFILE') OR define('USERPROFILE','m_user_profile');
|
||||
defined('USERPROFILEID') OR define('USERPROFILEID','userid');
|
||||
|
||||
defined('ENTITY') OR define('ENTITY','m_entities');
|
||||
defined('ENTITYID') OR define('ENTITYID','entity_id');
|
||||
|
||||
defined('ENTITYCHILD') OR define('ENTITYCHILD','m_entity_child');
|
||||
defined('ENTITYCHILDID') OR define('ENTITYCHILDID','entity_child_id');
|
||||
|
||||
defined('USERPROFILEHIERARCHY') OR define('USERPROFILEHIERARCHY','m_user_lender_hierarchy');
|
||||
defined('USERPROFILEHIERARCHYID') OR define('USERPROFILEHIERARCHYID','user_lender_hierarchy_id');
|
||||
|
||||
defined('USERPROFILEROLES') OR define('USERPROFILEROLES','m_user_roles');
|
||||
defined('USERPROFILEROLESID') OR define('USERPROFILEROLESID','user_role_id');
|
||||
|
||||
defined('LENDER') OR define('LENDER','m_lender');
|
||||
defined('LENDERID') OR define('LENDERID','lender_id');
|
||||
|
||||
|
||||
|
||||
@ -61,46 +61,9 @@ $route['translate_uri_dashes'] = FALSE;
|
||||
*/
|
||||
/* Routes regards Common Masters CRUD operations*/
|
||||
|
||||
$route['getListOfMasters'] = 'Common_Masters_Controller/getListOfMasters';
|
||||
$route['saveNewUser'] = 'Common_Masters_Controller/saveNewUser';
|
||||
$route['listAllUsers'] = 'Common_Masters_Controller/listAllUsers';
|
||||
|
||||
$route['getListOfIndustryClassifications'] = 'Common_Masters_Controller/getListOfIndustryClassifications';
|
||||
$route['saveIndustryClassification'] = 'Common_Masters_Controller/saveIndustryClassification';
|
||||
|
||||
$route['getListOfProducts'] = 'Common_Masters_Controller/getListOfProducts';
|
||||
$route['saveProducts'] = 'Common_Masters_Controller/saveProducts';
|
||||
|
||||
$route['getListOfSubProducts'] = 'Common_Masters_Controller/getListOfSubProducts';
|
||||
$route['saveSubProducts'] = 'Common_Masters_Controller/saveSubProducts';
|
||||
|
||||
$route['getListOfUOM'] = 'Common_Masters_Controller/getListOfUOM';
|
||||
$route['saveUOM'] = 'Common_Masters_Controller/saveUOM';
|
||||
|
||||
$route['getListOfOccupationNonEarningMembers'] = 'Common_Masters_Controller/getListOfOccupationNonEarningMembers';
|
||||
$route['saveOccupationNonEarningMembers'] = 'Common_Masters_Controller/saveOccupationNonEarningMembers';
|
||||
|
||||
$route['getListOfTypeOfActivities'] = 'Common_Masters_Controller/getListOfTypeOfActivities';
|
||||
$route['saveTypeOfActivity'] = 'Common_Masters_Controller/saveTypeOfActivity';
|
||||
|
||||
$route['getListOfTitles'] = 'Common_Masters_Controller/getListOfTitles';
|
||||
$route['saveTitle'] = 'Common_Masters_Controller/saveTitle';
|
||||
|
||||
$route['getListOfRelationships'] = 'Common_Masters_Controller/getListOfRelationships';
|
||||
$route['saveRelationship'] = 'Common_Masters_Controller/saveRelationship';
|
||||
|
||||
$route['getListOfFrequencies'] = 'Common_Masters_Controller/getListOfFrequencies';
|
||||
$route['saveFrequency'] = 'Common_Masters_Controller/saveFrequency';
|
||||
|
||||
$route['getListOfCustomerBehaviours'] = 'Common_Masters_Controller/getListOfCustomerBehaviours';
|
||||
$route['saveCustomerBehaviour'] = 'Common_Masters_Controller/saveCustomerBehaviour';
|
||||
|
||||
$route['getListOfRegions'] = 'Common_Masters_Controller/getListOfRegions';
|
||||
$route['saveRegion'] = 'Common_Masters_Controller/saveRegion';
|
||||
|
||||
$route['getListOfCites'] = 'Common_Masters_Controller/getListOfCites';
|
||||
$route['saveCity'] = 'Common_Masters_Controller/saveCity';
|
||||
|
||||
// $route['getListOfCites'] = 'Common_Masters_Controller/getListOfCites';
|
||||
// $route['saveCity'] = 'Common_Masters_Controller/saveCity';
|
||||
|
||||
$route['getListOfBranches'] = 'Common_Masters_Controller/getListOfBranches';
|
||||
$route['saveBranch'] = 'Common_Masters_Controller/saveBranch';
|
||||
@ -108,5 +71,5 @@ $route['saveBranch'] = 'Common_Masters_Controller/saveBranch';
|
||||
$route['getListOfMaster'] = 'Common_Masters_Controller/getListOfMaster';
|
||||
$route['saveMaster'] = 'Common_Masters_Controller/saveMaster';
|
||||
|
||||
//$route['login'] = 'User_Management_Controller/saveNewUser';
|
||||
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ class Branch_Controller extends REST_Controller {
|
||||
|
||||
// load the model
|
||||
$this->load->model('Branch_model', 'branch_model');
|
||||
//$this->load->library('AWS_S3');
|
||||
$this->load->library('AWS_S3');
|
||||
//$this->load->library('AWS_SNS');
|
||||
//$this->load->library('AWS_SES');
|
||||
}
|
||||
@ -70,7 +70,7 @@ class Branch_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
public function testAWSS3_get()
|
||||
public function testAWSS3_post()
|
||||
{
|
||||
/* CREATE NEW BUCKETS*/
|
||||
// $b = $this->aws_s3->createNewBucket('thecucumber');
|
||||
@ -92,15 +92,24 @@ class Branch_Controller extends REST_Controller {
|
||||
|
||||
/* STORE FILE TO S3*/
|
||||
|
||||
// $file = $_FILES['myfile']['tmp_name'];
|
||||
// $file2 = $_FILES['myfile']['name'];
|
||||
$file = $_FILES['myfile']['tmp_name'];
|
||||
$file2 = $_FILES['myfile']['name'];
|
||||
//print_r($file);
|
||||
// print_r($file2);
|
||||
//print_r($file2);
|
||||
|
||||
// $s3pathname = 'byapi/'.$file2;
|
||||
// $data = array('bucket_name'=>'thecucumber','key'=>$s3pathname,'sourcefile'=>$file);
|
||||
// $res = $this->aws_s3->uploadFileToS3Bucket($data);
|
||||
// print_r($res);
|
||||
$s3pathname = 'byapi/'.$file2;
|
||||
$data = array('bucket_name'=>'thecucumber','key'=>$s3pathname,'sourcefile'=>$file);
|
||||
$res = $this->aws_s3->uploadFileToS3Bucket($data);
|
||||
//print_r($res);
|
||||
echo is_object($res);
|
||||
echo is_array($res);
|
||||
echo "*********\n\n";
|
||||
echo $res['ObjectURL'];
|
||||
echo $res['@metadata']['statusCode'];
|
||||
// foreach($res as $key => $value)
|
||||
// {
|
||||
// echo $key."\n\n";
|
||||
// }
|
||||
|
||||
/* STORE FILE TO S3*/
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -24,23 +24,128 @@ class User_Management_Controller extends REST_Controller {
|
||||
public function listAllUsers_get()
|
||||
{
|
||||
|
||||
$result = $this->User_Management_Model->$listAllUsers();
|
||||
if($result['data_status'])
|
||||
{
|
||||
$data['dataStatus'] = true;
|
||||
$data['status'] = REST_Controller::HTTP_OK;
|
||||
$data['records'] = $result['data'];
|
||||
$this->response($data,REST_Controller::HTTP_OK);
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['dataStatus'] = false;
|
||||
$data['status'] = REST_Controller::HTTP_NO_CONTENT;
|
||||
$this->response($data,REST_Controller::HTTP_NO_CONTENT);
|
||||
}
|
||||
}
|
||||
|
||||
public function saveNewUser_post()
|
||||
{
|
||||
echo "saveNewUser_post";
|
||||
$data = $this->post('data');
|
||||
$roles = "";
|
||||
$lender_hierarchy = "";
|
||||
|
||||
//$file = $_FILES['myfile'];
|
||||
print_r($data);//print_r($file);
|
||||
}
|
||||
if($this->post('roles')){ $roles = $this->post('roles'); }
|
||||
|
||||
if($this->post('lender_hierarchy')){ $lender_hierarchy = $this->post('lender_hierarchy'); }
|
||||
|
||||
|
||||
$records = $this->post('records');
|
||||
$roles = $this->post('roles');
|
||||
|
||||
$lender_hierarchy = $this->post('lender_hierarchy');
|
||||
|
||||
if($_FILES['profilepic']['tmp_name'])
|
||||
{
|
||||
|
||||
|
||||
$profilepic = $_FILES['profilepic']['tmp_name'];
|
||||
$profilepicname = $_FILES['profilepic']['name'];
|
||||
$profilepicname = strtolower($profilepicname);
|
||||
$profilepics3path = "";
|
||||
|
||||
if(array_key_exists('fk_entity_id'),$records)
|
||||
{
|
||||
$entity_id = $records['fk_entity_id'];
|
||||
if($entity_id == 1) //1 means sine_edge Profile
|
||||
{
|
||||
$profilepics3path = 'sineedge/'.$profilepicname;
|
||||
}
|
||||
else if($entity_id == 2)//1 means lender Profile
|
||||
{
|
||||
$profilepics3path = 'lender/'.$profilepicname;
|
||||
}
|
||||
else // else or 3 means vendor Profile
|
||||
{
|
||||
$profilepics3path = 'vendor/'.$profilepicname;
|
||||
}
|
||||
}
|
||||
|
||||
$bucketname = PROFILEPICTUREBUCKETNAME;
|
||||
$key = $profilepics3path;
|
||||
$sourcefile = $profilepic;
|
||||
|
||||
$data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>$sourcefile);
|
||||
$s3result= $this->aws_s3->uploadFileToS3Bucket($data);
|
||||
|
||||
if(is_object($s3result) && $s3result['ObjectURL'] != '' && [$s3result'@metadata']['statusCode'] == 200)
|
||||
{
|
||||
$records['profilepic'] = $profilepicname;
|
||||
}
|
||||
else
|
||||
{
|
||||
$records['profilepic'] = null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
$user_id = $this->User_Management_Model->saveRecords($recordrs,USERPROFILE);//insert user records and get userid
|
||||
|
||||
if($roles != "")
|
||||
{
|
||||
foreach($roles as $role)
|
||||
{
|
||||
$role_array = array('user_role'=>$role['user_role'],'fk_userid'=>$user_id);//insert roles againest user
|
||||
$this->User_Management_Model->saveRecords($role_array,USERPROFILEROLES);
|
||||
}
|
||||
}
|
||||
|
||||
if($lender_hierarchy != "")
|
||||
{
|
||||
foreach($lender_hierarchy as $hierarchy)
|
||||
{
|
||||
$hierarchy = array('fk_hierarchy_id'=>$hierarchy['fk_hierarchy_id'],'fk_user_id'=>$user_id,'fk_createdby'=>$records['fk_createdby'],'createdon'=>$records['createdon']);//insert hierarchy againest lender type users
|
||||
$this->User_Management_Model->saveRecords($hierarchy,USERPROFILEHIERARCHY);
|
||||
}
|
||||
}
|
||||
|
||||
if($user_id != '' || $user_id != null)
|
||||
{
|
||||
$data['dataStatus'] = true;
|
||||
$data['status'] = REST_Controller::HTTP_OK;
|
||||
$data['record'] = $user_id;
|
||||
$this->response($data,REST_Controller::HTTP_OK);
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['dataStatus'] = false;
|
||||
$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
|
||||
$this->response($data,REST_Controller::HTTP_NOT_MODIFIED);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public function updateExistUser_post()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -56,16 +56,24 @@ class AWS_S3
|
||||
|
||||
public function uploadFileToS3Bucket($data)
|
||||
{
|
||||
$result = "";
|
||||
try {
|
||||
|
||||
$result = $this->S3->putObject([
|
||||
'Bucket' => $data['bucket_name'],
|
||||
'Key' => $data['key'],
|
||||
'SourceFile' => $data['sourcefile'],
|
||||
'ContentType' => '*/*',
|
||||
'StorageClass' => 'STANDARD',
|
||||
'ACL'=>'public-read'
|
||||
]);
|
||||
return $result;
|
||||
$result = $this->S3->putObject([
|
||||
'Bucket' => $data['bucket_name'],
|
||||
'Key' => $data['key'],
|
||||
'SourceFile' => $data['sourcefile'],
|
||||
'ContentType' => '*/*',
|
||||
'StorageClass' => 'STANDARD',
|
||||
'ACL'=>'public-read'
|
||||
]);
|
||||
|
||||
} catch (AwsException $e)
|
||||
{
|
||||
$result = false;;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function getSingleObjectInaBucket()
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
require_once APPPATH . '/libraries/SPARQ_Model.php';
|
||||
class Branch_model extends SPARQ_Model {
|
||||
|
||||
public function __construct() {
|
||||
|
||||
@ -10,6 +10,35 @@ class User_Management_Model extends SPARQ_Model {
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function listAllUsers()
|
||||
{
|
||||
$result_data = array();
|
||||
|
||||
$this->select('USERPROFILE.userid, USERPROFILE.aws_name, USERPROFILE.first_name, USERPROFILE.last_name, USERPROFILE.email, USERPROFILE.alt_email, USERPROFILE.mobile_no, USERPROFILE.alt_mobile_no, USERPROFILE.addressline1, USERPROFILE.addressline2, USERPROFILE.profilepic, USERPROFILE.createdon, USERPROFILE.fk_createdby,USERPROFILE1.first_name,USERPROFILE1.last_name, USERPROFILE.updatedon, USERPROFILE.fk_updatedby,USERPROFILE2.first_name,USERPROFILE2.last_name, USERPROFILE.fk_entity_id,ENTITY.full_name, USERPROFILE.isactive, USERPROFILE.fk_designation,DESIGNATION.name, USERPROFILE.addressline3, USERPROFILE.fk_city,CITY.name, USERPROFILE.fk_state,STATE.name, USERPROFILE.pincode');
|
||||
$this->db->from(USERPROFILE.'as USERPROFILE');
|
||||
$this->db->join(ENTITY.'as ENTITY','USERPROFILE.fk_entity_id = ENTITY.entity_id and ENTITY.isactive = 1');
|
||||
$this->db->join(DESIGNATION.'as DESIGNATION','USERPROFILE.fk_designation = DESIGNATION.designation_id and DESIGNATION.isactive = 1');
|
||||
$this->db->join(STATE.'as STATE','USERPROFILE.fk_state = STATE.state_id and STATE.isactive = 1');
|
||||
$this->db->join(CITY.'as CITY','USERPROFILE.fk_city = CITY.city_id and CITY.isactive = 1');
|
||||
$this->db->join(USERPROFILE.'as USERPROFILE1','USERPROFILE.fk_createdby = USERPROFILE1.userid and USERPROFILE1.isactive = 1');
|
||||
$this->db->join(USERPROFILE.'as USERPROFILE2','USERPROFILE.fk_updatedby = USERPROFILE2.userid and USERPROFILE2.isactive = 1');
|
||||
//$this->db->where('USERPROFILE.isactive = 1');
|
||||
$result = $this->db->get()->result_array();
|
||||
|
||||
if(count($result) > 0 )
|
||||
{
|
||||
$result_data['data_status'] = true;
|
||||
$result_data['data'] = $result;
|
||||
return $result_data;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
$result_data['data_status'] = false;
|
||||
$result_data['data'] = null;
|
||||
return $result_data;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user