updates
This commit is contained in:
@@ -64,7 +64,7 @@ $routes->get('/en/desktop/api/v2/myfituser/profile', 'Myfituser::users');
|
|||||||
$routes->get('/en/desktop/api/v2/myfituser/myfeed', 'Myfituser::users');
|
$routes->get('/en/desktop/api/v2/myfituser/myfeed', 'Myfituser::users');
|
||||||
|
|
||||||
//Tracking
|
//Tracking
|
||||||
$routes->get('/en/desktop/api/v2/myfituser/tracking', 'Myfituser::users');
|
$routes->post('/en/desktop/api/v2/myfituser/tracking', 'Myfituser::users');
|
||||||
$routes->get('/en/desktop/api/v2/myfituser/trackcategory', 'Myfituser::users');
|
$routes->get('/en/desktop/api/v2/myfituser/trackcategory', 'Myfituser::users');
|
||||||
|
|
||||||
// REMINDERS -------------------------------------------------------------
|
// REMINDERS -------------------------------------------------------------
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ class Myfituser extends BaseController
|
|||||||
'resources' => ['GET'],
|
'resources' => ['GET'],
|
||||||
'trackcategory' => ['GET'],
|
'trackcategory' => ['GET'],
|
||||||
'resetpass' => ['POST'],
|
'resetpass' => ['POST'],
|
||||||
|
'tracking' => ['POST'],
|
||||||
];
|
];
|
||||||
|
|
||||||
$res1 = [];
|
$res1 = [];
|
||||||
@@ -133,6 +134,10 @@ class Myfituser extends BaseController
|
|||||||
$myfitTracking = new \App\Models\myfitTracking();
|
$myfitTracking = new \App\Models\myfitTracking();
|
||||||
$res1 = $myfitTracking->getTrackCategory();
|
$res1 = $myfitTracking->getTrackCategory();
|
||||||
break;
|
break;
|
||||||
|
case 'tracking':
|
||||||
|
$myfitTracking = new \App\Models\myfitTracking();
|
||||||
|
$res1 = $myfitTracking->trackEngine($raw_array);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->response->setJson($res1);
|
return $this->response->setJson($res1);
|
||||||
|
|||||||
+36
-29
@@ -16,41 +16,48 @@ class baseModel extends Model
|
|||||||
|
|
||||||
public function insert_db($inserDataArray, $insertTable)
|
public function insert_db($inserDataArray, $insertTable)
|
||||||
{
|
{
|
||||||
foreach ($inserDataArray as $arr) {
|
$insert_id=0;
|
||||||
$ic = 0;
|
$ic = 0;
|
||||||
$fl_part = '';
|
$fl_part = '';
|
||||||
$val_part = '';
|
$val_part = '';
|
||||||
$sqlQ = '';
|
$sqlQ = '';
|
||||||
$fields = array_keys($arr);
|
$fields = array_keys($inserDataArray);
|
||||||
foreach ($fields as $field) {
|
foreach ($fields as $field) {
|
||||||
$fl_part .= $ic > 0 ? ',' : '';
|
$fl_part .= $ic > 0 ? ',' : '';
|
||||||
$fl_part .= $field;
|
$fl_part .= $field;
|
||||||
|
|
||||||
$val_part .= $ic > 0 ? ',' : '';
|
$val_part .= $ic > 0 ? ',' : '';
|
||||||
$val_part .= "'" . $arr[$field] . "'";
|
$val_part .= "'" . $inserDataArray[$field] . "'";
|
||||||
$ic++;
|
$ic++;
|
||||||
}
|
|
||||||
$sqlQ = "INSERT INTO $insertTable ($fl_part) VALUES ($val_part)";
|
|
||||||
$query = $this->db->query($sqlQ);
|
|
||||||
}
|
}
|
||||||
return 0;
|
$sqlQ = "INSERT INTO $insertTable ($fl_part) VALUES ($val_part)";
|
||||||
|
$query = $this->db->query($sqlQ);
|
||||||
|
$insert_id = $this->db->insert_id();
|
||||||
|
return $insert_id;
|
||||||
}
|
}
|
||||||
public function update_db($UupdateDataArray,$whereAray, $updateTable)
|
public function update_db($UupdateDataArray,$whereAray, $updateTable)
|
||||||
{
|
{
|
||||||
foreach ($UupdateDataArray as $arr) {
|
$ic = 0;
|
||||||
$ic = 0;
|
$UP_part = '';
|
||||||
$UP_part = '';
|
$val_part = '';
|
||||||
$val_part = '';
|
$sqlQ = '';
|
||||||
$sqlQ = '';
|
$fields = array_keys($UupdateDataArray);
|
||||||
$fields = array_keys($arr);
|
foreach ($fields as $field) {
|
||||||
foreach ($fields as $field) {
|
$UP_part .= $ic > 0 ? ',' : '';
|
||||||
$UP_part .= $ic > 0 ? ',' : '';
|
$UP_part .= $field="'" . $UupdateDataArray[$field] . "'";
|
||||||
$UP_part .= $field="'" . $arr[$field] . "'";
|
$ic++;
|
||||||
$ic++;
|
|
||||||
}
|
|
||||||
$sqlQ = "UPDATE $updateTable SET $UP_part WHERE ($val_part)";
|
|
||||||
$query = $this->db->query($sqlQ);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$ic = 0;
|
||||||
|
$fields = array_keys($whereAray);
|
||||||
|
foreach ($fields as $field) {
|
||||||
|
$val_part .= $ic > 0 ? ' AND ' : ' WHERE ';
|
||||||
|
$val_part .= $field."='" . $whereAray[$field] . "'";
|
||||||
|
$ic++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$sqlQ = "UPDATE $updateTable SET $UP_part $val_part";
|
||||||
|
$query = $this->db->query($sqlQ);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class myfitPricing extends baseModel
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
'icon' => '/static/media/unlimited.png',
|
'icon' => '/static/media/unlimited.png',
|
||||||
'title' => 'Unlimited',
|
'title' => 'Gold',
|
||||||
'text' => 'Professionals here.',
|
'text' => 'Professionals here.',
|
||||||
'price' => '$7.99/m',
|
'price' => '$7.99/m',
|
||||||
'price_anual' => '$55/y',
|
'price_anual' => '$55/y',
|
||||||
|
|||||||
@@ -43,4 +43,41 @@ class myfitTracking extends baseModel
|
|||||||
{
|
{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function trackEngine($in){
|
||||||
|
$insert_id=0;
|
||||||
|
switch($in['code']){
|
||||||
|
case "WEIGT":
|
||||||
|
$inData = [
|
||||||
|
'member_id'=>$in['member_id'],
|
||||||
|
'val1'=>$in['value'],
|
||||||
|
'munit'=>$in['unit'],
|
||||||
|
];
|
||||||
|
$insert_id = $this->insert_db($inData, 'members_tracking_summary');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['insert_id'=> $insert_id, 'raw_data'=>$in ];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
------- TRACKING NOW
|
||||||
|
|
||||||
|
CREATE TABLE members_tracking_summary (
|
||||||
|
id SERIAL,
|
||||||
|
uuid UUID DEFAULT (gen_random_uuid()),
|
||||||
|
code VARCHAR(5) REFERENCES tracking_category(code) NOT NULL,
|
||||||
|
val1 VARCHAR(25),
|
||||||
|
val2 VARCHAR(25),
|
||||||
|
munit VARCHAR(15),
|
||||||
|
track_uuid VARCHAR(100),
|
||||||
|
added timestamp without time zone DEFAULT now(),
|
||||||
|
loc INET
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE ONLY members_tracking_summary
|
||||||
|
ADD CONSTRAINT members_tracking_summary_id_key UNIQUE (id)
|
||||||
|
;
|
||||||
|
|
||||||
|
*/
|
||||||
|
|||||||
@@ -124,14 +124,31 @@ class myfitUserReminders extends baseModel
|
|||||||
$end_date = $in['end_date'];
|
$end_date = $in['end_date'];
|
||||||
$notes = $in['notes'];
|
$notes = $in['notes'];
|
||||||
|
|
||||||
|
$inData = [
|
||||||
|
'description'=>$description,
|
||||||
|
'category'=>$category,
|
||||||
|
'mode'=>$mode,
|
||||||
|
'start_date'=>$start_date,
|
||||||
|
'end_date'=>$end_date
|
||||||
|
];
|
||||||
|
$inWhere=[
|
||||||
|
'member_id' =>$member_id,
|
||||||
|
'uuid'=> $uuid
|
||||||
|
];
|
||||||
|
$ret11 = $this->update_db($inData,$inWhere, 'members_reminders');
|
||||||
|
|
||||||
$sqlQ = "SELECT * FROM members_reminders WHERE member_id = $member_id AND uuid ='$uuid' ";
|
$sqlQ = "SELECT * FROM members_reminders WHERE member_id = $member_id AND uuid ='$uuid' ";
|
||||||
$query = $this->db->query($sqlQ);
|
$query = $this->db->query($sqlQ);
|
||||||
|
$updated_reminder = $query->getResultArray();
|
||||||
|
|
||||||
return [];
|
return [
|
||||||
|
'updated_reminder' => $updated_reminder
|
||||||
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
public function update_db($UupdateDataArray,$whereAray, $updateTable)
|
||||||
$sql = "INSERT INTO table (title) VALUES('" . $db->escapeString($title) . "')";
|
$sql = "INSERT INTO table (title) VALUES('" . $db->escapeString($title) . "')";
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ class userAccess extends baseModel
|
|||||||
'session_token' => $this->generateSession($member_id),
|
'session_token' => $this->generateSession($member_id),
|
||||||
'member_id' => $member_id,
|
'member_id' => $member_id,
|
||||||
'member_uuid' => $member_uid,
|
'member_uuid' => $member_uid,
|
||||||
|
'guid' => $member_uid,
|
||||||
'profile' => $data['profile_data'][0],
|
'profile' => $data['profile_data'][0],
|
||||||
'settings' => [],
|
'settings' => [],
|
||||||
'layout'=> ['dash'=>$computedDash],
|
'layout'=> ['dash'=>$computedDash],
|
||||||
|
|||||||
Reference in New Issue
Block a user