Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
HIAST-Clinics
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
almohanad.hafez
HIAST-Clinics
Commits
5c9ea6fe
Commit
5c9ea6fe
authored
Aug 31, 2024
by
Almouhannad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(F) Add show visits history inside create visit
parent
8deabac6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
8 deletions
+46
-8
create-visit.component.css
...components/doctor/create-visit/create-visit.component.css
+12
-0
create-visit.component.html
...omponents/doctor/create-visit/create-visit.component.html
+24
-5
create-visit.component.ts
.../components/doctor/create-visit/create-visit.component.ts
+8
-1
history.component.ts
...nd/src/app/components/doctor/history/history.component.ts
+2
-2
No files found.
Clinics.Frontend/src/app/components/doctor/create-visit/create-visit.component.css
View file @
5c9ea6fe
...
@@ -84,6 +84,18 @@
...
@@ -84,6 +84,18 @@
box-shadow
:
0
0
0
0.1em
var
(
--heading-color
);
box-shadow
:
0
0
0
0.1em
var
(
--heading-color
);
}
}
.custom-show-visits-button
.btn-outline-primary
{
color
:
white
;
background-color
:
var
(
--accent-color
);
border-color
:
var
(
--accent-color
);
}
.custom-show-visits-button
.btn-outline-primary
:hover
{
background-color
:
white
;
color
:
var
(
--accent-color
);
box-shadow
:
0
0
0
0.1em
var
(
--accent-color
);
}
/* #endregion */
/* #endregion */
/* #region Back-button*/
/* #region Back-button*/
...
...
Clinics.Frontend/src/app/components/doctor/create-visit/create-visit.component.html
View file @
5c9ea6fe
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<div
class=
"custom-ok-button mb-3"
>
<div
class=
"custom-ok-button mb-3"
>
<button
type=
"button"
class=
"btn btn-outline-primary"
<button
type=
"button"
class=
"btn btn-outline-primary"
(
click
)="
openModal
(
selectMedicineModal
)"
>
إضافة دواء +
</button>
(
click
)="
openM
edicinesM
odal
(
selectMedicineModal
)"
>
إضافة دواء +
</button>
</div>
</div>
<div
class=
"custom-child"
dir=
"rtl"
*
ngIf=
"medicines.length !== 0"
>
<div
class=
"custom-child"
dir=
"rtl"
*
ngIf=
"medicines.length !== 0"
>
...
@@ -131,15 +131,27 @@
...
@@ -131,15 +131,27 @@
data-bs-parent=
"#accordionExample"
>
data-bs-parent=
"#accordionExample"
>
<div
class=
"accordion-body"
>
<div
class=
"accordion-body"
>
<div
class=
"d-grid gap-3 mb-5 custom-buttons custom-form-buttons"
>
<div
class=
"d-grid gap-3 custom-buttons custom-show-visits-button"
>
<button
type=
"button"
class=
"btn btn-outline-primary"
(
click
)="
openVisitsModal
(
visitsHistoryModal
);"
>
عرض التاريخ المرضي
<i
class=
"bi bi-clock-history"
></i>
</button>
</div>
<div
class=
"d-grid gap-3 mb-5 custom-buttons custom-form-buttons"
>
<button
type=
"submit"
class=
"btn btn-outline-primary"
<button
type=
"submit"
class=
"btn btn-outline-primary"
[
disabled
]="!
form
.
dirty
||
form
.
invalid
"
>
[
disabled
]="!
form
.
dirty
||
form
.
invalid
"
>
حفظ
حفظ
<i
class=
"bi bi-save"
></i>
<i
class=
"bi bi-save"
></i>
</button>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -163,3 +175,10 @@
...
@@ -163,3 +175,10 @@
<app-search-for-medicine
[
parentModal
]="
modal
"
(
created
)="
onAddMedicine
($
event
)"
></app-search-for-medicine>
<app-search-for-medicine
[
parentModal
]="
modal
"
(
created
)="
onAddMedicine
($
event
)"
></app-search-for-medicine>
</div>
</div>
</ng-template>
</ng-template>
<ng-template
#
visitsHistoryModal
let-modal
>
<div
class=
"modal-body"
>
<app-history
[
patientId
]="
employeeId
"
></app-history>
</div>
</ng-template>
\ No newline at end of file
Clinics.Frontend/src/app/components/doctor/create-visit/create-visit.component.ts
View file @
5c9ea6fe
...
@@ -60,13 +60,20 @@ export class CreateVisitComponent implements OnInit {
...
@@ -60,13 +60,20 @@ export class CreateVisitComponent implements OnInit {
return
`
${
this
.
employee
.
firstName
}
${
this
.
employee
.
middleName
}
${
this
.
employee
.
lastName
}
`
return
`
${
this
.
employee
.
firstName
}
${
this
.
employee
.
middleName
}
${
this
.
employee
.
lastName
}
`
}
}
openModal
(
modal
:
any
):
void
{
openM
edicinesM
odal
(
modal
:
any
):
void
{
this
.
modalService
.
open
(
modal
,
{
this
.
modalService
.
open
(
modal
,
{
centered
:
true
,
centered
:
true
,
size
:
'md'
size
:
'md'
});
});
}
}
openVisitsModal
(
modal
:
any
):
void
{
this
.
modalService
.
open
(
modal
,
{
centered
:
true
,
size
:
'lg'
});
}
isMedicinesSectionOpen
:
boolean
=
false
;
isMedicinesSectionOpen
:
boolean
=
false
;
isOptionsSectionOpen
:
boolean
=
false
;
isOptionsSectionOpen
:
boolean
=
false
;
...
...
Clinics.Frontend/src/app/components/doctor/history/history.component.ts
View file @
5c9ea6fe
import
{
Component
,
OnChanges
,
OnInit
,
SimpleChanges
}
from
'@angular/core'
;
import
{
Component
,
Input
,
OnChanges
,
OnInit
,
SimpleChanges
}
from
'@angular/core'
;
import
{
EmployeesDataService
}
from
'../../../services/employees/employees-data.service'
;
import
{
EmployeesDataService
}
from
'../../../services/employees/employees-data.service'
;
import
{
ActivatedRoute
,
Router
}
from
'@angular/router'
;
import
{
ActivatedRoute
,
Router
}
from
'@angular/router'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
...
@@ -24,7 +24,7 @@ export class HistoryComponent implements OnInit {
...
@@ -24,7 +24,7 @@ export class HistoryComponent implements OnInit {
this
.
setId
();
this
.
setId
();
}
}
patientId
:
number
;
@
Input
(
"patientId"
)
patientId
:
number
;
setId
():
void
{
setId
():
void
{
this
.
route
.
params
.
subscribe
((
params
:
any
)
=>
{
this
.
route
.
params
.
subscribe
((
params
:
any
)
=>
{
this
.
patientId
=
Number
(
params
.
id
);
this
.
patientId
=
Number
(
params
.
id
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment