Skip to content
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.

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

solve conflicts #83

Merged
merged 254 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
63126e9
sub interface for skin diag with a test.html proposition
menoc61 Aug 28, 2023
9d90585
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin
menoc61 Aug 28, 2023
f530907
modification du formulaire et sauvegarde dans la BD
menoc61 Aug 28, 2023
1beb6cd
Merge branch 'menoc61:master' into master
fresnel25 Aug 28, 2023
a455ed0
Merge pull request #5 from fresnel25/master
menoc61 Aug 28, 2023
38a9604
update on login screen
menoc61 Aug 28, 2023
25d2383
modification du format de la facture
menoc61 Aug 28, 2023
6ed1f6a
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Aug 28, 2023
164be3b
update on login screen
menoc61 Aug 28, 2023
97043e1
Merge branch 'menoc61:master' into master
fresnel25 Aug 28, 2023
d70be55
Merge pull request #6 from fresnel25/master
fresnel25 Aug 28, 2023
e0c763c
importation de la classe Rule
fresnel25 Aug 30, 2023
b46b761
Merge pull request #7 from fresnel25/master
fresnel25 Aug 30, 2023
5a2a169
ajout du statut "Paid" et personnalisation de la facture des soins
menoc61 Aug 30, 2023
a6ee728
Merge pull request #8 from fresnel25/master
fresnel25 Aug 30, 2023
0ccd916
send test to database
menoc61 Sep 1, 2023
b40ee51
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin
menoc61 Sep 1, 2023
f4cccdf
progrestion on edit host page
menoc61 Sep 4, 2023
db654d8
complete patient crud
menoc61 Sep 13, 2023
f3dae3c
update de l'hôte
menoc61 Sep 15, 2023
405ea73
Merge pull request #9 from fresnel25/master
fresnel25 Sep 15, 2023
5dc0f19
finish with edit and view test.blade
menoc61 Sep 18, 2023
cf3c8ed
add treatant list to teaiment widget
menoc61 Sep 18, 2023
9a3a2ee
stagger push
menoc61 Sep 25, 2023
1c27c26
filtres pour les différentes tables
menoc61 Sep 25, 2023
8a55a31
Merge pull request #10 from fresnel25/master
fresnel25 Sep 25, 2023
abe42d1
prescription stagger commit
menoc61 Sep 25, 2023
dcf6f36
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin
menoc61 Sep 25, 2023
9a0400f
televesement des produit de l'appli de stock
menoc61 Sep 27, 2023
f4d1228
modification sur le module de facturation et les filtres
menoc61 Sep 27, 2023
bb0e8b9
Modification des billings
menoc61 Sep 27, 2023
81f0dcb
Merge pull request #11 from fresnel25/master
fresnel25 Sep 27, 2023
941bc12
fix bug on treatment
menoc61 Sep 27, 2023
70ad93c
fix bugs on patients/test controller
menoc61 Sep 27, 2023
d79752a
Merge pull request #12 from menoc61/master
fresnel25 Sep 27, 2023
75bc334
Merge pull request #13 from menoc61/dev
fresnel25 Sep 27, 2023
0f110d7
Merge branch 'menoc61:master' into master
fresnel25 Sep 29, 2023
835b345
csvcontroller update
menoc61 Oct 2, 2023
479ccc2
Merge branch 'menoc61:master' into master
fresnel25 Oct 2, 2023
f0464be
récupération de la session pour les factures et création du praticien
menoc61 Oct 2, 2023
0808ae8
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Oct 2, 2023
d09dfd1
Merge pull request #14 from fresnel25/master
fresnel25 Oct 2, 2023
c93f2a0
Merge pull request #15 from menoc61/dev
menoc61 Oct 2, 2023
d6d544e
deploy .env.example
menoc61 Oct 2, 2023
4b74cf9
add pm2 deployment script
menoc61 Oct 2, 2023
35b7eed
Update installation-guide.md
menoc61 Oct 2, 2023
ce0ecc7
Merge pull request #16 from menoc61/menoc61-patch-1
menoc61 Oct 2, 2023
cc236bd
create soin with product data 🥱
menoc61 Oct 10, 2023
417a118
View diagnostics for each user at the user list level
menoc61 Oct 11, 2023
67c59eb
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Oct 11, 2023
1206d40
Merge pull request #17 from fresnel25/master
fresnel25 Oct 11, 2023
cfa11bf
Change the color of the SIDNAV and add the content to view_diagnostic…
menoc61 Oct 11, 2023
b1b7518
Merge pull request #18 from fresnel25/master
fresnel25 Oct 11, 2023
25e1391
traduction et correction orthographique
kotchapjordan2304 Oct 11, 2023
3658c21
traduction
kotchapjordan2304 Oct 11, 2023
fa9f606
Merge pull request #19 from kotchapjordan2304/master
kotchapjordan2304 Oct 12, 2023
3f1d7b9
added Back Button
menoc61 Oct 13, 2023
91115d1
Merge pull request #20 from fresnel25/master
fresnel25 Oct 13, 2023
bc5b2bc
Add and fix profil image on patient form
menoc61 Oct 18, 2023
103ba91
Merge branch 'master' into master
fresnel25 Oct 18, 2023
14f9b05
Merge pull request #22 from fresnel25/master
fresnel25 Oct 18, 2023
a4a83c8
ajout de la description automatiquement en fonction du diagnostic
menoc61 Oct 20, 2023
d3d2b16
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Oct 20, 2023
c48945f
Merge pull request #23 from fresnel25/master
fresnel25 Oct 20, 2023
27b154b
Merge pull request #24 from menoc61/dev
menoc61 Oct 20, 2023
9088a3f
fix conflit
menoc61 Oct 20, 2023
7f95768
Merge pull request #25 from fresnel25/master
fresnel25 Oct 20, 2023
932d0c6
update on main branch
menoc61 Oct 20, 2023
058561e
bootstrap-multiselect offline
menoc61 Oct 20, 2023
3b201ac
empty table
menoc61 Oct 20, 2023
757ea81
Fixed the homepage to become responsive
menoc61 Oct 20, 2023
aabf1e9
Merge pull request #26 from fresnel25/master
fresnel25 Oct 20, 2023
bb12364
meta page
menoc61 Oct 20, 2023
66d0ffe
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Oct 20, 2023
3875dba
Merge pull request #27 from fresnel25/master
fresnel25 Oct 20, 2023
c8f810e
add badge to profile
menoc61 Oct 20, 2023
a84941c
Merge branch 'menoc61:master' into master
fresnel25 Oct 20, 2023
a034bb8
add skin diagnoistic
menoc61 Oct 25, 2023
3b204fd
Merge branch 'menoc61:master' into master
fresnel25 Oct 27, 2023
e64105b
changer le design de la fiche de traitement et Ajout de la vue conce…
menoc61 Oct 27, 2023
4e8c4f7
Merge pull request #28 from fresnel25/master
menoc61 Oct 27, 2023
2de71b5
Merge pull request #29 from fresnel25/master
fresnel25 Oct 27, 2023
3faf0f1
Ajouter une vue pour avoir les informations concernant un diagnostic
menoc61 Nov 6, 2023
a54d40f
creation du User
menoc61 Nov 17, 2023
cc86b4a
Merge pull request #31 from fresnel25/master
fresnel25 Nov 17, 2023
1ee3a00
dashbord avec graphe
menoc61 Nov 20, 2023
9e3b146
Merge pull request #32 from fresnel25/master
fresnel25 Nov 20, 2023
8c09091
Ajout du graphe présentant le C.A. de chaque mois d'une année et Ajou…
menoc61 Nov 22, 2023
62b00c4
Merge pull request #33 from fresnel25/master
fresnel25 Nov 22, 2023
4075b8b
Merge pull request #30 from fresnel25/master
menoc61 Nov 24, 2023
a14a979
Create php.yml
menoc61 Nov 24, 2023
5a50699
Faire les différentes opérations à partir du dossier de l'hôte
menoc61 Nov 24, 2023
e4a9f52
Merge pull request #34 from fresnel25/master
menoc61 Nov 24, 2023
5c868a2
Merge pull request #35 from menoc61/dev
menoc61 Nov 27, 2023
bbc0ac3
enable RDV module
menoc61 Nov 27, 2023
f561274
Merge pull request #36 from fresnel25/master
fresnel25 Nov 27, 2023
e8fe2ca
Merge pull request #37 from menoc61/dev
menoc61 Nov 27, 2023
2ceb2fa
update graphe for Amount
menoc61 Nov 27, 2023
2080d7b
Merge pull request #38 from fresnel25/master
menoc61 Nov 27, 2023
7c6ff1b
assign role bug fixed
menoc61 Dec 15, 2023
67b757d
docker files
menoc61 Dec 15, 2023
eb91008
check list ui #1
menoc61 Dec 15, 2023
52ad2b6
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin
menoc61 Dec 15, 2023
a2c56df
first fix Pratician Session
menoc61 Mar 7, 2024
6386148
Merge pull request #39 from fresnel25/master
fresnel25 Mar 7, 2024
7cc6b7b
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Mar 7, 2024
6b6c380
Merge pull request #40 from menoc61/dev
menoc61 Mar 16, 2024
2d5f80f
select ui [update] -- initialise follow.blade -- update dashboard
menoc61 Mar 17, 2024
b5bb66f
Fixed .gitignore
menoc61 Mar 17, 2024
bb3080f
[add] ui for follow.blade.php
menoc61 Mar 17, 2024
68a7e97
[update] php.yml to match gitigniore fix and documentation [add] lice…
menoc61 Mar 18, 2024
6190a01
[remove] unit test from php.yml
menoc61 Mar 18, 2024
ae6e7ad
fix payment, pratician and admin session
menoc61 Mar 19, 2024
761023e
add property dosage to prescriptions table
menoc61 Mar 19, 2024
0cc8555
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Mar 19, 2024
b262fe0
fix all conflits
menoc61 Mar 19, 2024
52fbe9a
Merge pull request #45 from fresnel25/master
fresnel25 Mar 19, 2024
bf05764
[update] setup.sh
menoc61 Mar 23, 2024
7c5f940
update auto-installation and setup.sh
menoc61 Mar 24, 2024
977cc7a
[update] follow.blade.php end of treatement followup
menoc61 Mar 31, 2024
71e2fbf
fix Api Route
menoc61 Apr 1, 2024
bce5f74
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Apr 1, 2024
2be8dc6
Merge pull request #46 from fresnel25/master
fresnel25 Apr 1, 2024
980350e
[ajust] appoinment callbacks
menoc61 Apr 1, 2024
225d37c
Api for mobile and fix MailNotification
menoc61 Apr 8, 2024
56f2b29
Merge pull request #47 from fresnel25/master
fresnel25 Apr 8, 2024
0f109ac
[add and update] wait list and notification module, prepare twilo con…
menoc61 Apr 17, 2024
aace82c
[stagger update] non sucess fix notification msg [add] appointment fi…
menoc61 Apr 17, 2024
b30d54c
laravel sanctum
menoc61 Apr 17, 2024
7a65a7b
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Apr 17, 2024
9ae71ac
Merge pull request #48 from fresnel25/master
fresnel25 Apr 17, 2024
5e70dcc
fix user apiController and dashboard
menoc61 Apr 22, 2024
42366a5
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
menoc61 Apr 22, 2024
28c5791
Merge pull request #49 from fresnel25/master
fresnel25 Apr 22, 2024
83cbd12
[Add] route /api/v1/users/me to get the data of the auth user
menoc61 Apr 25, 2024
5699f66
[remove] useless user data
menoc61 Apr 25, 2024
10d2241
add logout method
menoc61 Apr 25, 2024
88bc1eb
get back reason on follow.blade.php
menoc61 Apr 30, 2024
fade2bf
[patch] restriction on delete and submit button for appointment && fo…
menoc61 May 1, 2024
bb2a08b
fix UserApiController createtest function
fresnel25 May 3, 2024
2f7ebe7
Merge pull request #50 from fresnel25/master
fresnel25 May 3, 2024
2e4cbc7
fix UI web Hôte
fresnel25 May 6, 2024
3407173
Merge branch 'menoc61:master' into master
fresnel25 May 6, 2024
3ba98da
Merge pull request #51 from fresnel25/master
fresnel25 May 6, 2024
8c48f49
fix UI web Hote for RDV
fresnel25 May 7, 2024
a565b9e
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
fresnel25 May 7, 2024
aae0853
Merge pull request #52 from fresnel25/master
fresnel25 May 7, 2024
a709356
fix ui
fresnel25 May 7, 2024
36a7a37
Merge pull request #53 from fresnel25/master
fresnel25 May 7, 2024
3cd2d22
[Add] visited at column on follow and all appointment blade.php
menoc61 May 9, 2024
55d20a3
fix dashboard admin
fresnel25 May 10, 2024
355b2c5
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
fresnel25 May 10, 2024
12dcc3e
Merge pull request #54 from fresnel25/master
fresnel25 May 10, 2024
430330c
fix modification UI web hote
fresnel25 May 10, 2024
fd3cfb0
Merge pull request #55 from fresnel25/master
fresnel25 May 10, 2024
74295a1
Mettre sur pied un système de traçabilité sur les différentes opérati…
fresnel25 May 14, 2024
6c4adef
Merge pull request #56 from fresnel25/master
fresnel25 May 14, 2024
2e7f67d
change database use postgresql
fresnel25 May 16, 2024
4d9a396
Merge pull request #57 from fresnel25/master
fresnel25 May 16, 2024
a9e27ca
change sidenav icon and fix custom.js
fresnel25 May 17, 2024
ce7447b
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
fresnel25 May 17, 2024
fd16c29
change sidenav
fresnel25 May 17, 2024
cb43901
view psychotérapie
fresnel25 May 21, 2024
580fff3
Merge pull request #58 from fresnel25/master
fresnel25 May 21, 2024
3eff636
fix work flow admin
fresnel25 May 23, 2024
5950c82
Merge branch 'master' of https://github.com/fresnel25/gestion-des-soi…
fresnel25 May 23, 2024
b91fecd
fix work flow new user
fresnel25 May 24, 2024
a28d3de
fix work flow app gestion de soin
fresnel25 May 24, 2024
fa120d5
Merge pull request #59 from fresnel25/master
fresnel25 May 24, 2024
768a2de
make agenda for praticien
fresnel25 May 27, 2024
c40ef4b
Merge branch 'menoc61:master' into master
fresnel25 May 27, 2024
4131f10
Merge pull request #60 from fresnel25/master
fresnel25 May 27, 2024
d15e7d8
fix workfow and start facturation module
fresnel25 May 27, 2024
3174054
Merge pull request #61 from fresnel25/master
fresnel25 May 27, 2024
ed3886a
change view RDV
fresnel25 May 28, 2024
eef56a9
Merge pull request #62 from fresnel25/master
fresnel25 May 28, 2024
848b6f8
Ajouter le soin pour un rendez vous
fresnel25 May 29, 2024
2e4a5b3
Merge pull request #63 from fresnel25/master
fresnel25 May 29, 2024
2a50076
module facturation
fresnel25 May 29, 2024
4e3b04c
module de facturation
fresnel25 May 30, 2024
055b2c9
add total amount on billing
fresnel25 May 30, 2024
7cc50c1
facturation
fresnel25 May 31, 2024
66ffd0d
système de paiement
fresnel25 Jun 3, 2024
0ca612f
Merge pull request #64 from fresnel25/master
fresnel25 Jun 3, 2024
250976c
Merge pull request #3 from menoc61/master
fresnel25 Jun 3, 2024
9e528f0
fix workflow
fresnel25 Jun 4, 2024
0b3d39f
notification function
fresnel25 Jun 5, 2024
9853677
[configure] kafka-php dependency
menoc61 Jun 5, 2024
a137800
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin-…
menoc61 Jun 5, 2024
dd1ae74
fix notification system and fix workflow
fresnel25 Jun 6, 2024
2fe989a
Merge pull request #5 from menoc61/master
fresnel25 Jun 13, 2024
4822e7c
synchronisation with node api
fresnel25 Jun 24, 2024
cde5dfc
Merge pull request #66 from fresnel25/master
fresnel25 Jun 24, 2024
0d4d6c8
chane dashboard vue
fresnel25 Jun 25, 2024
d596000
Merge pull request #67 from fresnel25/master
fresnel25 Jun 25, 2024
60a4e8a
Fix dashboard workflow
fresnel25 Jun 26, 2024
b3f10ae
Merge pull request #68 from fresnel25/master
fresnel25 Jun 26, 2024
ba8d03a
add rapport and doctor properties
fresnel25 Jun 27, 2024
31e71b6
fix dashboard app soin
fresnel25 Jun 27, 2024
7ae3639
settle cors
menoc61 Jul 14, 2024
f2515a8
fix bug
fresnel25 Jul 17, 2024
77e9fb5
Merge branch 'menoc61:master' into master
fresnel25 Jul 17, 2024
0a8a3dd
Merge pull request #69 from fresnel25/master
fresnel25 Jul 17, 2024
68e55cf
synchronisation login
fresnel25 Jul 25, 2024
71037b2
Merge pull request #70 from fresnel25/master
fresnel25 Jul 25, 2024
b120c76
change login sys
fresnel25 Aug 22, 2024
7061238
Merge branch 'menoc61:master' into master
fresnel25 Aug 22, 2024
ea13bb2
Merge pull request #71 from fresnel25/master
fresnel25 Aug 22, 2024
d19d9e9
fix login an register form
fresnel25 Aug 28, 2024
6884a4a
style css
fresnel25 Aug 30, 2024
6287244
Merge pull request #72 from fresnel25/master
fresnel25 Aug 30, 2024
f49d496
fix register function and connect to stock backend
fresnel25 Sep 4, 2024
81e7cf9
Merge branch 'menoc61:master' into master
fresnel25 Sep 4, 2024
5a05f91
fix all modif soin
fresnel25 Sep 25, 2024
14edfaf
Merge pull request #73 from fresnel25/master
fresnel25 Sep 25, 2024
2f34fc0
ajout de soin au niveau de la vue de l'hôte
fresnel25 Sep 30, 2024
efd55a8
Merge branch 'menoc61:master' into master
fresnel25 Sep 30, 2024
a7e76b9
Merge pull request #74 from fresnel25/master
fresnel25 Sep 30, 2024
648068e
modif de la_vue_diagnose+Img_profile+lien_redirectiondashboard
Yvana2005 Oct 30, 2024
37965f2
Modification_img_profil
Yvana2005 Oct 30, 2024
3018b97
Ajout_nouveau_statut_RDV_annulee
Yvana2005 Nov 4, 2024
67eecf9
modification_Formulaire_prise_RDV
Yvana2005 Nov 5, 2024
e97cb2c
correction orthographique
Yvana2005 Nov 5, 2024
5ef201c
modification_affichage_agendas_praticien
Yvana2005 Nov 6, 2024
48871a6
add some change
GuiGui2401 Nov 8, 2024
00c1be0
add env
GuiGui2401 Nov 8, 2024
1d9be7a
add some change
GuiGui2401 Nov 8, 2024
b58fb2b
Merge pull request #6 from Yvana2005/master
fresnel25 Nov 10, 2024
84505e6
Merge pull request #75 from GuiGui2401/master
GuiGui2401 Nov 11, 2024
2c97939
Merge branch 'master' into master
fresnel25 Nov 11, 2024
ac76089
Merge pull request #76 from fresnel25/master
fresnel25 Nov 11, 2024
395d7b0
editer_un _soin
Yvana2005 Nov 11, 2024
5e06da1
Merge branch 'master' of https://github.com/Yvana2005/gestion-des-soi…
Yvana2005 Nov 11, 2024
f726465
Merge branch 'master' of https://github.com/menoc61/gestion-des-soin-…
GuiGui2401 Nov 11, 2024
cce78e2
Correction_des_conflits
Yvana2005 Nov 12, 2024
0bf1ea4
modification_du_.env
Yvana2005 Nov 12, 2024
db5d2cb
Merge branch 'fresnel25:master' into master
Yvana2005 Nov 12, 2024
c133320
Affichage_Agendas_Praticien
Yvana2005 Nov 12, 2024
33d7d59
modification_env
Yvana2005 Nov 12, 2024
d19e127
solve edit appointment
GuiGui2401 Nov 12, 2024
75b3d38
Merge pull request #77 from menoc61/editappointment
GuiGui2401 Nov 12, 2024
67f96b8
add view practician agenda
GuiGui2401 Nov 12, 2024
1ae36a9
Merge pull request #78 from menoc61/editappointment2
GuiGui2401 Nov 12, 2024
024b7cf
Merge branch 'master' into soin
Yvana2005 Nov 12, 2024
a1c5ff3
Merge pull request #79 from menoc61/soin
Yvana2005 Nov 12, 2024
b2eedd7
solve appointments
GuiGui2401 Nov 12, 2024
c933771
Merge pull request #80 from menoc61/editappointment3
GuiGui2401 Nov 12, 2024
da24ac2
solve edit profile and store appointment
GuiGui2401 Nov 12, 2024
d1f8e25
Merge pull request #81 from menoc61/editappointment4
GuiGui2401 Nov 12, 2024
5dbb7a9
Resolve merge conflict by incorporating both suggestions
GuiGui2401 Nov 13, 2024
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
Prev Previous commit
Next Next commit
stagger push
  • Loading branch information
menoc61 committed Sep 25, 2023
commit 9a3a2ee33b6a0d2636cf1e3caee246525d0aba0c
8 changes: 4 additions & 4 deletions app/Http/Controllers/TestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function store(Request $request)
$test->signes_particuliers_ongles_mains = json_encode($request->signes_particuliers_ongles_mains);
$test->soinList_main = json_encode($request->soinList_main);
$test->vernisInput_main = $request->vernisInput_main;
$test->obserationInput_main = $request->obserationInput_main;
// $test->obserationInput_main = $request->obserationInput_main;
$test->reliefInput_main = $request->reliefInput_main;
$test->cicatrices_main = $request->cicatrices_main;
$test->callosites_main = $request->callosites_main;
Expand All @@ -88,7 +88,7 @@ public function store(Request $request)
$test->signes_particuliers_ongles_pieds = json_encode($request->signes_particuliers_pieds);
$test->soinList_pied = json_encode($request->soinList_pied);
$test->vernisInput_pied = $request->vernisInput_pied;
$test->obserationInput_pied = $request->obserationInput_pied;
// $test->obserationInput_pied = $request->obserationInput_pied;
$test->etat_pieds = $request->etat_pieds;
$test->taches_pieds = $request->taches_pieds;
$test->aureoles_pieds = $request->aureoles_pieds;
Expand Down Expand Up @@ -168,7 +168,7 @@ public function store_edit(Request $request)
$test->signes_particuliers_ongles_mains = json_encode($request->signes_particuliers_ongles_mains);
$test->soinList_main = json_encode($request->soinList_main);
$test->vernisInput_main = $request->vernisInput_main;
$test->obserationInput_main = $request->obserationInput_main;
// $test->obserationInput_main = $request->obserationInput_main;
$test->reliefInput_main = $request->reliefInput_main;
$test->cicatrices_main = $request->cicatrices_main;
$test->callosites_main = $request->callosites_main;
Expand All @@ -186,7 +186,7 @@ public function store_edit(Request $request)
$test->signes_particuliers_ongles_pieds = json_encode($request->signes_particuliers_pieds);
$test->soinList_pied = json_encode($request->soinList_pied);
$test->vernisInput_pied = $request->vernisInput_pied;
$test->obserationInput_pied = $request->obserationInput_pied;
// $test->obserationInput_pied = $request->obserationInput_pied;
$test->etat_pieds = $request->etat_pieds;
$test->taches_pieds = $request->taches_pieds;
$test->aureoles_pieds = $request->aureoles_pieds;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions resources/views/test/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,15 @@ class="col-sm-3 col-form-label">{{ __('sentence.vernis') }}</label>
name="vernisInput_main">
</div>
</div>
<hr>
{{-- <hr>
<div class="form-group row">
<label for="obseration-mains"
class="col-sm-3 col-form-label">{{ __('sentence.obseration') }}</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="obseration-mains"
name="obserationInput_main">
</div>
</div>
</div> --}}
<hr>
<h5>FACE INTERNE</h5>
<div class="form-group row">
Expand Down Expand Up @@ -336,15 +336,15 @@ class="col-sm-3 col-form-label">{{ __('sentence.vernis') }}</label>
name="vernisInput_pied">
</div>
</div>
<hr>
{{-- <hr>
<div class="form-group row">
<label for="obseration"
class="col-sm-3 col-form-label">{{ __('sentence.obseration') }}</label>
<div class="col-sm-9">
<input type="text" class="form-control" id="obseration"
name="obserationInput_pied">
</div>
</div>
</div> --}}
<hr>
<div class="form-group row">
<div class="col-sm-9">
Expand Down
260 changes: 260 additions & 0 deletions storage/framework/views/4f6fabc15d3571421b99cf0bbdf4c552c561e572.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
<?php $__env->startSection('title'); ?>
<?php echo e(__('sentence.View Prescription')); ?>

<?php $__env->stopSection(); ?>
<?php $__env->startSection('content'); ?>
<div class="d-sm-flex align-items-center justify-content-between mb-4">
<h1 class="h3 mb-0 text-gray-800"></h1>
<button href="" class="d-none d-sm-inline-block btn btn-sm btn-primary shadow-sm print_prescription"><i class="fas fa-print fa-sm text-white-50"></i> Print</button>
</div>
<div class="row justify-content-center">
<div class="col-10">
<div class="card shadow mb-4">
<div class="card-body">
<!-- ROW : Doctor informations -->
<div class="row">
<div class="col">
<?php if(!empty(App\Setting::get_option('logo'))): ?>
<img src="<?php echo e(asset('uploads/'.App\Setting::get_option('logo'))); ?>"><br><br>
<?php endif; ?>
<?php echo clean(App\Setting::get_option('header_left')); ?>

</div>
<div class="col-md-3">
<p><b><?php echo e(__('sentence.Date')); ?> :</b> <?php echo e($prescription->created_at->format('d M Y')); ?></p>
<p><b><?php echo e(__('sentence.Reference')); ?> :</b> <?php echo e($prescription->reference); ?></p>
</div>
</div>
<!-- END ROW : Doctor informations -->
<!-- ROW : Patient informations -->
<div class="row">
<div class="col">
<hr>
<p>
<b><?php echo e(__('sentence.Patient Name')); ?> :</b> <?php echo e($prescription->User->name); ?>

<?php if(isset($prescription->User->Patient->birthday)): ?>
- <b><?php echo e(__('sentence.Age')); ?> :</b> <?php echo e($prescription->User->Patient->birthday); ?> (<?php echo e(\Carbon\Carbon::parse($prescription->User->Patient->birthday)->age); ?> Years)
<?php endif; ?>
<?php if(isset($prescription->User->Patient->gender)): ?>
- <b><?php echo e(__('sentence.Gender')); ?> :</b> <?php echo e(__('sentence.'.$prescription->User->Patient->gender)); ?>

<?php endif; ?>
<?php if(isset($prescription->User->Patient->weight)): ?>
- <b><?php echo e(__('sentence.Patient Weight')); ?> :</b> <?php echo e($prescription->User->Patient->weight); ?> Kg
<?php endif; ?>
<?php if(isset($prescription->User->Patient->height)): ?>
- <b><?php echo e(__('sentence.Patient Height')); ?> :</b> <?php echo e($prescription->User->Patient->height); ?>

<?php endif; ?>
</p>
<hr>
</div>
</div>
<!-- END ROW : Patient informations -->
<?php if(count($prescription_drugs) > 0): ?>
<!-- ROW : Drugs List -->
<div class="row justify-content-center">
<div class="col">
<?php $__currentLoopData = $prescription_drugs; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $drug): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<li><?php echo e($drug->type); ?> - <?php echo e($drug->Drug->trade_name); ?> <?php echo e($drug->strength); ?> - <?php echo e($drug->dose); ?> - <?php echo e($drug->duration); ?> <br> <?php echo e($drug->drug_advice); ?></li>
<?php if($loop->last): ?>
<div style="margin-bottom: 150px;"></div>
<hr>
<?php endif; ?>
<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
</div>
</div>
<?php endif; ?>
<?php if(count($prescription_tests) > 0): ?>
<!-- ROW : Tests List -->
<div class="row justify-content-center">
<div class="col">
<strong><u><?php echo e(__('sentence.Test to do')); ?> </u></strong><br><br>
<?php $__currentLoopData = $prescription_tests; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $test): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<li><?php echo e($test->Test->test_name); ?> <?php if(empty(!$test->description)): ?> - <?php echo e($test->description); ?> <?php endif; ?></li>
<?php if($loop->last): ?>
<div style="margin-bottom: 150px;"></div>
<hr>
<?php endif; ?>
<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
<hr>
</div>
</div>
<!-- END ROW : Tests List -->
<?php endif; ?>
<?php if(!empty(App\Setting::get_option('footer_left')) && !empty(App\Setting::get_option('footer_right'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_left')); ?></p>
</div>
<div class="col">
<p class="float-right font-size-12"><?php echo clean(App\Setting::get_option('footer_right')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php elseif(empty(App\Setting::get_option('footer_left'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_right')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php elseif(empty(App\Setting::get_option('footer_right'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_left')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php else: ?>
<?php endif; ?>
</div>
</div>
</div>
</div>
<!-- Hidden prescription -->
<div id="print_area" style="display: none;">
<!-- ROW : Doctor informations -->
<div class="row">
<div class="col-9">
<?php if(!empty(App\Setting::get_option('logo'))): ?>
<img src="<?php echo e(asset('uploads/'.App\Setting::get_option('logo'))); ?>"><br><br>
<?php endif; ?>
<?php echo clean(App\Setting::get_option('header_left')); ?>

</div>
<div class="col-3">
<?php echo e(__('sentence.On')); ?> <?php echo e($prescription->created_at->format('d M Y')); ?>

</div>
</div>
<!-- END ROW : Doctor informations -->
<hr>
<!-- ROW : Patient informations -->
<div class="row">
<div class="col">
<p>
<b><?php echo e(__('sentence.Patient Name')); ?> :</b> <?php echo e($prescription->User->name); ?>

<?php if(isset($prescription->User->Patient->birthday)): ?>
- <b><?php echo e(__('sentence.Age')); ?> :</b> <?php echo e($prescription->User->Patient->birthday); ?> (<?php echo e(\Carbon\Carbon::parse($prescription->User->Patient->birthday)->age); ?> <?php echo e(__('sentence.Years')); ?>)
<?php endif; ?>
<?php if(isset($prescription->User->Patient->gender)): ?>
- <b><?php echo e(__('sentence.Gender')); ?> :</b> <?php echo e(__('sentence.'.$prescription->User->Patient->gender)); ?>

<?php endif; ?>
<?php if(isset($prescription->User->Patient->weight)): ?>
- <b><?php echo e(__('sentence.Patient Weight')); ?> :</b> <?php echo e($prescription->User->Patient->weight); ?> Kg
<?php endif; ?>
<?php if(isset($prescription->User->Patient->height)): ?>
- <b><?php echo e(__('sentence.Patient Height')); ?> :</b> <?php echo e($prescription->User->Patient->height); ?>

<?php endif; ?>
</p>
<hr>
<h5 class="text-center"><b><?php echo e(__('sentence.Prescription')); ?></b></h5>
<hr>
</div>
</div>
<!-- END ROW : Patient informations -->
<?php if(count($prescription_drugs) > 0): ?>
<!-- ROW : Drugs List -->
<div class="row justify-content-center">
<div class="col">
<?php $__currentLoopData = $prescription_drugs; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $drug): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<li><?php echo e($drug->type); ?> - <?php echo e($drug->Drug->trade_name); ?> <?php echo e($drug->strength); ?> - <?php echo e($drug->dose); ?> - <?php echo e($drug->duration); ?> <br> <?php echo e($drug->drug_advice); ?></li>
<?php if($loop->last): ?>
<div style="margin-bottom: 150px;"></div>
<hr>
<?php endif; ?>
<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
</div>
</div>
<?php endif; ?>
<?php if(count($prescription_tests) > 0): ?>
<!-- ROW : Tests List -->
<div class="row justify-content-center">
<div class="col">
<strong><u><?php echo e(__('sentence.Test to do')); ?> </u></strong><br><br>
<?php $__currentLoopData = $prescription_tests; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $test): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
<li><?php echo e($test->Test->test_name); ?> <?php if(empty(!$test->description)): ?> - <?php echo e($test->description); ?> <?php endif; ?></li>
<?php if($loop->last): ?>
<div style="margin-bottom: 150px;"></div>
<hr>
<?php endif; ?>
<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
<hr>
</div>
</div>
<!-- END ROW : Tests List -->
<?php endif; ?>
<!-- ROW : Footer informations -->
<footer style="position: absolute; bottom: 0;">
<hr >
<?php if(!empty(App\Setting::get_option('footer_left')) && !empty(App\Setting::get_option('footer_right'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_left')); ?></p>
</div>
<div class="col">
<p class="float-right font-size-12"><?php echo clean(App\Setting::get_option('footer_right')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php elseif(empty(App\Setting::get_option('footer_left'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_right')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php elseif(empty(App\Setting::get_option('footer_right'))): ?>
<!-- ROW : Footer informations -->
<div class="row">
<div class="col">
<p class="font-size-12"><?php echo clean(App\Setting::get_option('footer_left')); ?></p>
</div>
</div>
<!-- END ROW : Footer informations -->
<?php else: ?>
<?php endif; ?>
</footer>
<!-- END ROW : Footer informations -->
</div>
<?php $__env->stopSection(); ?>
<?php $__env->startSection('header'); ?>
<style type="text/css">
p, u, li {
color: #444444 !important;
}
</style>
<?php $__env->stopSection(); ?>
<?php $__env->startSection('footer'); ?>
<script type="text/javascript">
function printDiv(divName) {

var printContents = document.getElementById(divName).innerHTML;
var originalContents = document.body.innerHTML;

document.body.innerHTML = printContents;

window.print();

document.body.innerHTML = originalContents;
}


$(function(){
$(document).on("click", '.print_prescription',function () {
printDiv('print_area');
});
});
</script>
<?php $__env->stopSection(); ?>
<?php echo $__env->make('layouts.master', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH C:\Users\user\Desktop\gestion des soins\v1.0\resources\views/prescription/view.blade.php ENDPATH**/ ?>
Loading