Skip to content

Refactor med interview #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Programmers4u wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Refactor med interview #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9829e28
init wip
Programmers4u Nov 3, 2020
d5e980f
init, wip
Programmers4u Nov 3, 2020
9ca4cae
Merge branch 'master' into refactor_med_interview
Programmers4u Nov 9, 2020
b0c2868
Merge branch 'master' into refactor_med_interview
Programmers4u Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 56 additions & 9 deletions app/Models/MedInterview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

namespace App\Models;

use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Timegridio\Concierge\Models\Contact;

class MedInterview extends Model
{
Expand All @@ -12,10 +14,26 @@ class MedInterview extends Model
protected $softDelete = true;
protected $dates = ['deleted_at'];
protected $table = 'medical_interview';
protected $fillable = ['json_data','contact_id'];

public $contact_id = null;
public $json_data = null;
const TABLE = 'medical_interview';
const ID = 'id';
const JSON_DATA = 'json_data';
const CONTACT_ID = 'contact_id';

const DEFAULT_FORMAT_DATE = 'Y-m-d H:i:s';

protected $fillable = [
self::JSON_DATA,
self::CONTACT_ID,
];

const RELATION_CONTACT = 'contact';

public function contact() {
return $this->belongsTo(Contact::class, self::CONTACT_ID);
}
// public $contact_id = null;
// public $json_data = null;

private $json_data_model = null;

Expand All @@ -41,13 +59,18 @@ private function getMedicines(){
}

private function defaultDataModel(){
$desc = '';
$desc = [
'value'=> '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
'updateAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE)
];
$aid = [
[
'id' => 1,
'name' => 'Lek na wszystko',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
];
$diseases = [
Expand All @@ -56,86 +79,104 @@ private function defaultDataModel(){
'name' => trans('medical.interview.diseases.1'),
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.2'),
'id' => '2',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.3'),
'id' => '3',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.4'),
'id' => '4',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.5'),
'id' => '5',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.6'),
'id' => '6',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.7'),
'id' => '7',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.8'),
'id' => '8',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.9'),
'id' => '9',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.10'),
'id' => '10',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.11'),
'id' => '11',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],/*
[
'name' => trans('medical.interview.diseases.12'),
'id' => '12',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],
[
'name' => trans('medical.interview.diseases.13'),
'id' => '13',
'value' => false,
'desc' => '',
'createAt' => Carbon::now()->format(self::DEFAULT_FORMAT_DATE),
],*/
];

return ['aid' => $aid, 'diseases' => $diseases,'desc' => $desc];
}

public function getJsonData($contactId) {
$back = $this->query()->select('json_data')->where('contact_id','=',$contactId)->first();
public function getJsonData($contactId) : array
{
$back = $this->query()
->select('json_data')
->where('contact_id','=',$contactId)
->get()
;
if($back != null){
$back = $back->toArray();
$back = json_decode($back['json_data']);
Expand All @@ -146,7 +187,7 @@ public function getJsonData($contactId) {
$this->json_data_model['diseases'][$indx]['value']=$back->diseases[$indx]->value;
}

$this->json_data_model['desc'] = $back->desc;
$this->json_data_model['desc']['value'] = $back->desc->value;

foreach($this->json_data_model['aid'] as $indx=>$model){
if(count($back->aid) <= $indx) break;
Expand Down Expand Up @@ -175,7 +216,8 @@ public function updateJsonModel($options){
}
break;
case 'desc' :
$this->json_data_model['desc'] = $options['pair']['value'];
$this->json_data_model['desc']['value'] = $options['pair']['value'];
$this->json_data_model['desc']['updateAt'] = Carbon::now()->format(self::DEFAULT_FORMAT_DATE);
break;
case 'aid' :
foreach($this->json_data_model['aid'] as $indx=>$model){
Expand All @@ -184,7 +226,12 @@ public function updateJsonModel($options){
}
break;
}
$result = $this->updateOrCreate(['contact_id'=>$options['contact_id']],['contact_id'=>$options['contact_id'],'json_data' => json_encode($this->json_data_model, JSON_HEX_QUOT) ]);
$result = $this->updateOrCreate(
['contact_id'=>$options['contact_id'], self::CREATED_AT => Carbon::now()->format(self::DEFAULT_FORMAT_DATE)],
[
'contact_id'=>$options['contact_id'],
'json_data' => json_encode($this->json_data_model, JSON_HEX_QUOT)
]);
return $result;
}
}
2 changes: 1 addition & 1 deletion resources/views/medical/_interview.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
$('#medicine').val(tab);
$('#medicine').trigger('change');

$('[name=desc]').val('{{str_replace(["\r","\n"]," ",$interviewData['model']['desc'])}}');
$('[name=desc]').val('{{str_replace(["\r","\n"]," ",$interviewData['model']['desc']['value'])}}');
});
</script>
@endpush