From 6e370c38946a1d2312081c1f3b8b05d6edde742f Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Mon, 8 Jan 2024 14:12:35 +0530
Subject: [PATCH] [FIX] EMPLOYEE: Permission view fix

---
 .../employee/profile/profile_view.html          |  6 ------
 .../templates/employee/view/individual.html     |  8 ++++----
 employee/templates/tabs/note_tab.html           | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/employee/templates/employee/profile/profile_view.html b/employee/templates/employee/profile/profile_view.html
index a05867df2..74b6fab4c 100644
--- a/employee/templates/employee/profile/profile_view.html
+++ b/employee/templates/employee/profile/profile_view.html
@@ -255,12 +255,6 @@
 				  id="allowance_deduction"
 				>
 				</div>
-				<div
-					class="oh-general__tab-target oh-profile__info-tab mb-4 d-none"
-					id="payroll"
-				 >
-					{% include 'tabs/payroll-tab.html' %}
-				</div>
 				
 				
 				<!-- <div
diff --git a/employee/templates/employee/view/individual.html b/employee/templates/employee/view/individual.html
index 26ac8c60c..a5aa3016b 100644
--- a/employee/templates/employee/view/individual.html
+++ b/employee/templates/employee/view/individual.html
@@ -155,7 +155,7 @@
 						>{% trans "About" %}</a
 						>
 					</li>
-					{% if perms.employee.view_employee or request.user == employee.employee_user_id or request.user|check_manager:employee %}
+					{% if request.user == employee.employee_user_id or request.user|check_manager:employee %}
 					<li class="oh-general__tab">
 						<a
 						hx-get={% url 'shift-tab' employee.id %}
@@ -225,7 +225,7 @@
 						>{% trans "Team" %}</a
 						>
 					</li> {% endcomment %}
-					{% if perms.employee.view_historicalemployeeworkinformation or perms.employee.view_employee or request.user|check_manager:employee %}
+					{% if perms.employee.view_historicalemployeeworkinformation or request.user|check_manager:employee %}
 					<li class="oh-general__tab">
 						<a
 						href="#"
@@ -356,7 +356,7 @@
 					class="oh-general__tab-target oh-profile__info-tab mb-4 d-none"
 					id="history"
 				 >
-					{% if perms.employee.view_employee or request.user|check_manager:employee or request.user == employee.employee_user_id or perms.employee.view_historicalemployeeworkinformation %}
+					{% if request.user|check_manager:employee or request.user == employee.employee_user_id or perms.employee.view_historicalemployeeworkinformation %}
 						{% include "tabs/history.html" %}
 					{% endif %}
 
@@ -375,7 +375,7 @@
 					class="oh-general__tab-target oh-profile__info-tab mb-4 d-none"
 					id="leave"
 				 >
-					{% if perms.employee.view_employee or perms.leave.view_leaverequest or perms.leave.view_leavetype or request.user|check_manager:employee or request.user == employee.employee_user_id %}
+					{% if perms.leave.view_leaverequest or perms.leave.view_leavetype or request.user|check_manager:employee or request.user == employee.employee_user_id %}
 						{% include "tabs/leave-tab.html" %}
 					{% endif %}
 				</div>
diff --git a/employee/templates/tabs/note_tab.html b/employee/templates/tabs/note_tab.html
index 1ca6328d6..fe3d6c263 100644
--- a/employee/templates/tabs/note_tab.html
+++ b/employee/templates/tabs/note_tab.html
@@ -1,6 +1,7 @@
 {% load static %}{% load i18n %} {% load basefilters %}
 {% if notes != '' %}
 <span id="addnote" style="cursor: pointer;">
+  {% if perms.employee.add_employeenote or request.user|is_reportingmanager %}
     <button
       class="oh-btn oh-btn--secondary mt-2"
       hx-get='{% url "add-employee-note" employee.id %}'
@@ -12,12 +13,14 @@
       <ion-icon class="" name="add-outline" style="font-size: 24px;">
       </ion-icon>{% trans "Add Note" %}
     </button>
+    {% endif %}
   </span>
   <ol class="oh-activity-sidebar__qa-list" role="list">
     {% for note in notes %}
     <li class="oh-activity-sidebar__qa-item">
 
       <div class="d-flex justify-content-between">
+        {% if perms.employee.change_employeenote or request.user|is_reportingmanager %}
         <span
           class="oh-activity-sidebar__q"
           data-toggle="oh-modal-toggle"
@@ -25,7 +28,13 @@
           hx-get="{% url 'employee-note-update' note.id %}"
           hx-target="#modalContent"
           >{{forloop.counter}}. {{note.title}}</span
-        >
+          >
+        {% else %}
+          <span
+          class="oh-activity-sidebar__q"
+          >{{forloop.counter}}. {{note.title}}</span
+          >
+        {% endif %}
         {% if perms.employee.delete_employeenote or request.user|is_reportingmanager %}
         <a
           title="{% trans 'Delete' %}"
@@ -36,6 +45,7 @@
         ></a>
         {% endif %}
       </div>
+      {% if perms.employee.change_employeenote or request.user|is_reportingmanager %}
       <span
         data-toggle="oh-modal-toggle"
         data-target="#updateNoteModal"
@@ -43,6 +53,11 @@
         hx-target="#modalContent"
         >{{note.description}}</span
       >
+      {% else %}
+      <span
+        >{{note.description}}</span
+      >
+      {% endif %}
       <span class="oh-activity-sidebar__a">
         {% trans "by" %}
         <img