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

Author: VIvanova1

angular/src/app/shared/components/recipe1/recipe-add-med-form/recipe-add-med-form.component.html

@@ -90,7 +90,7 @@ <h4>Допълнителни бележки</h4>
   </div>
   <div id="btns-container">
     <button *ngIf="!isEditRecipe" class="btn" id="proceedBtn" type="button" (click)="CacheService.addMedicine(CacheService.nestedFormValues,CacheService.nameCurrentMedicines)">Предпиши</button>
-    <button *ngIf="isEditRecipe||role===role" id="editBtn" class="btn"  type="button" (click)="CacheService.editMedicine(CacheService.nestedFormValues)">Редактирай</button>
+    <button *ngIf="isEditRecipe||role==='GP'" id="editBtn" class="btn"  type="button" (click)="CacheService.editMedicine(CacheService.nestedFormValues)">Редактирай</button>
     <button  class="btn" id="cancelBtn" type="button" (click)="CacheService.hideAddMedicineComponent(currentmedicine, recipeId,inputevening)" [attr.idMedicine]="">Отказ</button>
   </div>
 </div>

angular/src/app/shared/components/recipe1/recipe-info-med/recipe-info-med.component.html

@@ -21,8 +21,8 @@ <h4 id="additionalInfoHeading">Допълнителни бележки</h4>
     <button class="btn" id="proceedBtn" (click)="finishMedicine()" *ngIf="userService.role === 'pharmacist'">Завърши</button>
 <!--    <button class="btn" id="proceedBtn">Завърши</button>-->
 <!--    <button class="btn" id="editBtn" *ngIf="userService.role === 'doctor'">Редактирай</button>-->
-    <button type="button" class="btn" (click)="editCurrentMedicament()" id="editBtn">Редактирай</button>
-    <button class="btn" (click)="DetailsService.deleteMedicament(currentRecord.medicineId)" id="cancelBtn">Изтрий</button>
+    <button type="button" class="btn" *ngIf="userService.role === 'GP'" (click)="editCurrentMedicament()" id="editBtn">Редактирай</button>
+    <button class="btn" *ngIf="userService.role === 'GP'" (click)="DetailsService.deleteMedicament(currentRecord.medicineId)" id="cancelBtn">Изтрий</button>
   </div>
 
 </div>