Merge branch 'main' of https://github.com/health-prescription-team/health-prescription-software-FE

Author: viktorShandrov

angular/src/app/shared/components/catalog-medicaments/catalog-medicaments.component.css

@@ -1,9 +1,7 @@
 .component {
   max-width: 80vw;
   min-height: 50vh;
-  /* background: rgb(229, 232, 248); */
   margin: 0 auto;
-  /* border: 1px solid black; */
   box-shadow: 1px 1px 10px rgb(187, 184, 184);
   padding: 1em;
 }
@@ -44,25 +42,18 @@
   border-radius: 0.5em;
   overflow: hidden;
   box-shadow:  5px 5px 10px rgba(0, 0, 0, 0.3),  inset 5px 5px 10px rgba(0, 0, 0, 0.1) ;/* Adjust the values as needed */
-
-  /* border: 1px solid red;  */
 }
 
 
 .group p {
   margin: 0;
-  /* background: #37E4FF; */
   padding: 5px;
   flex: 1;
   overflow: hidden;
   border-top-right-radius: 0.5em;
   border-top-left-radius: 0.5em;
   text-align: center;
   letter-spacing: 1px;
-  /* font-family: ' MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; */
-  /* text-transform: uppercase; */
-  /* font-size: 1.2em; */
-
 }
 
 .img {
@@ -83,7 +74,6 @@
 
 .details {
   flex: 0;
-  /* border:1px solid red; */
   border-bottom-left-radius: 0.5em;
   border-bottom-right-radius: 0.5em;
 }
@@ -144,14 +134,13 @@ button {
 }
 
 .medName {
-  position: relative; /* Create a stacking context for z-index */
-  z-index: 1; /* Place the text above the bandage */
-  /* Additional styling for the text if needed */
+  position: relative;
+  z-index: 1; 
   transform: rotate(-20deg);
   text-align: center;
-  color: rgba(0, 117, 220, 0.601);
-  /* margin: 0 auto; */
+  color: white;
   font-size: 1.2em;
+  font-weight: bold;
 
 }
 .group {
@@ -162,41 +151,7 @@ button {
   background-color: #90a9ba;
   color: white;
   letter-spacing: 1.2em;
-  /* font-size: 1.2em; */
   box-shadow:  5px 5px 10px rgba(0, 0, 0, 0.3),  inset 5px 5px 10px rgba(0, 0, 0, 0.1) ;/* Adjust the values as needed */
 
 }
-/* 
-
-.pharmacy {
-  background-color: #FFBB6B;
-  text-align: center;
-  align-self: flex-end;
-  border-radius: 26%;
-  position: relative;
-  width: 75%;
-  transform: rotate(45deg);
-  position: relative;
-  top: 17px;
-  right: -28px;
-  display: flex;
-  flex-direction: column;
-  box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.3), inset 5px 5px 10px rgba(0, 0, 0, 0.1);
-}
-
-.pharmacy p {
-  font-weight: bold;
-  letter-spacing: 1px;
-  color: white;
-  text-align: center;
-  border: 1px solid red;
-}
-
-.inside-bandage {
-  box-shadow: 5px 10px 10px rgba(0, 0, 0, 0.3), inset 5px 5px 10px rgba(0, 0, 0, 0.1);
-  background-color: #FF8A00;
-  margin-top: 10px;
-  margin-left: auto; 
-  
-} */
 

angular/src/app/shared/components/details/details.component.html

@@ -10,7 +10,7 @@
         <div class="right-box">
             <p class="name">{{currentMedicine.name}}</p>
           <div class="pharmacyAndPriceC">
-            <p class="pharmacyName">{{currentMedicine.pharmacyName}}</p>
+            <p class="pharmacyName">{{currentMedicine.medicineCompany}}</p>
             <div class="price">
               <p>{{currentMedicine.price}} лв</p>
             </div>

angular/src/app/shared/components/details/details.component.ts

@@ -40,7 +40,10 @@ export class DetailsComponent implements OnInit {
   medicineDetails(productId: string) {
     this.DetailsService.getMedicine(productId).subscribe(
       (res) => {
+        console.log(res);
+        
         this.currentMedicine = res;
+        this.currentMedicine.price = res.price.toFixed(2)
         // console.log('this.currentMedicine', this.currentMedicine);
         this.imagebytes = res.medicineImageBytes;
         this.imageSrc = this.binaryToPng(this.imagebytes);

angular/src/app/shared/components/register/register.component.html

@@ -10,7 +10,7 @@
       <div class="input-groups">
         <div class="form-group" *ngIf="currentRole=='pharmacy'||
                     currentRole=='pharmacist'">
-          <input type="text" name="Email" id="Email" placeholder="Email" #inputEmail="ngModel" required ngModel>
+          <input type="text" name="Email" id="Email" placeholder="Имейл" #inputEmail="ngModel" required ngModel>
         </div>
         <div *ngIf="form.controls['Email']?.touched && form.controls['Email'].invalid">
           <div *ngIf="form.controls['Email'].errors?.['required']" class="error">Полето е задължително</div>
@@ -29,7 +29,7 @@
         <div class="form-group" *ngIf="currentRole=='doctor'||
                     currentRole=='patient'||
                     currentRole=='pharmacist'">
-          <input type="text" name="MiddleName" id="middleName" placeholder="Иванов" #inputmiddleName="ngModel" required
+          <input type="text" name="MiddleName" id="middleName" placeholder="Презиме" #inputmiddleName="ngModel" required
             ngModel>
             <div *ngIf="form.controls['MiddleName']?.touched && form.controls['MiddleName'].invalid">
               <div *ngIf="form.controls['MiddleName'].errors?.['required']" class="error">Полето е задължително!</div>
@@ -69,7 +69,7 @@
 
         <div class="form-group" *ngIf="currentRole=='doctor'||
                     currentRole=='pharmacist'">
-          <input type="text" name="UinNumber" id="uinNumber" placeholder="1234567890" #inputuinNumber="ngModel"
+          <input type="text" name="UinNumber" id="uinNumber" placeholder="УИН" #inputuinNumber="ngModel"
             required minlength="10" pattern="[0-9]+"  ngModel>
         </div>
         <div *ngIf="form.controls['UinNumber']?.touched && form.controls['UinNumber'].invalid">