nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] EMPLOYEE : Asset report and fine modal issue in employee individu

Browse Source
This commit is contained in:
Horilla
2024-05-09 14:27:01 +05:30
parent f6bacfbe1f
commit 3a3076f4b9
4 changed files with 196 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
employee/sidebar.py Normal file
View File

@@ -0,0 +1,86 @@
"""
employee/sidebar.py
To set Horilla sidebar for employee
"""
from django.urls import reverse
from base.templatetags.basefilters import is_reportingmanager
from django.utils.translation import gettext_lazy as trans
MENU = trans("Employee")
IMG_SRC = "images/ui/employees.svg"
SUBMENUS = [
{
"menu": trans("Profile"),
"redirect": reverse("employee-profile"),
"accessibility": "employee.sidebar.profile_accessibility",
},
{
"menu": trans("Employees"),
"redirect": reverse("employee-view"),
},
{
"menu": trans("Document Requests"),
"redirect": reverse("document-request-view"),
"accessibility": "employee.sidebar.document_accessibility",
},
{
"menu": trans("Shift Requests"),
"redirect": reverse("shift-request-view"),
},
{
"menu": trans("Work Type Requests"),
"redirect": reverse("work-type-request-view"),
},
{
"menu": trans("Rotating Shift Assign"),
"redirect": reverse("rotating-shift-assign"),
"accessibility": "employee.sidebar.rotating_shift_accessibility",
},
{
"menu": trans("Rotating Work Type Assign"),
"redirect": reverse("rotating-work-type-assign"),
"accessibility": "employee.sidebar.rotating_work_type_accessibility",
},
{
"menu": trans("Disciplinary Actions"),
"redirect": reverse("disciplinary-actions"),
},
{
"menu": trans("Policies"),
"redirect": reverse("view-policies"),
},
{
"menu": trans("Organization Chart"),
"redirect": reverse("organisation-chart"),
},
]
def profile_accessibility(request, submenu, user_perms, *args, **kwargs):
return getattr(
request.session, "selected_company", "all"
) == "all" or request.user.employee_get.employee_work_info.company_id.id == getattr(
request.session, "selected_company", -1
)
def document_accessibility(request, submenu, user_perms, *args, **kwargs):
return request.user.has_perm(
"horilla_documents.view_documentrequest"
) or is_reportingmanager(request.user)
def rotating_shift_accessibility(request, submenu, user_perms, *args, **kwargs):
return request.user.has_perm(
"base.view_rotatingshiftassign"
) or is_reportingmanager(request.user)
def rotating_work_type_accessibility(request, submenu, user_perms, *args, **kwargs):
return request.user.has_perm(
"base.view_rotatingworktypeassign"
) or is_reportingmanager(request.user)

73
employee/templates/employee/view/individual.html
View File

@@ -106,6 +106,12 @@
<div id="enlargeImageContainer" class="enlarge-image-container"></div>
<div class="d-flex" style="flex-direction: row-reverse;">
<div id="successMessage" style="display:none;" class="oh-alert oh-alert--animated oh-alert--success w-25">
{% trans "Report added successfully." %}
</div>
</div>
<div class="oh-wrapper" id="view-container">
<div class="oh-card mt-4 mb-5">
<div class="d-flex flex-row-reverse">
@@ -560,6 +566,62 @@
</div>
</div>
<div
class="oh-modal"
id="addAssetReport"
role="dialog"
aria-labelledby="addAssetReport"
aria-hidden="true"
style="z-index: 1022; "
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title" id="addAssetReportLabel">
{% trans "Add Asset Report" %}
</h2>
<button
type="button"
class="oh-modal_close--custom"
onclick="$('#addAssetReport').removeClass('oh-modal--show');"
>
<ion-icon
name="close-outline"
role="img"
aria-label="close outline"
></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="addAssetReportForm"></div>
</div>
</div>
<div
class="oh-modal"
id="assetFineModal"
role="dialog"
aria-labelledby="assetFineModal"
aria-hidden="true"
style="z-index: 1022;"
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<button
type="button"
class="oh-modal_close--custom"
onclick="$('#assetFineModal').removeClass('oh-modal--show');"
>
<ion-icon
name="close-outline"
role="img"
aria-label="close outline"
></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="assetFineModalBody"></div>
</div>
</div>
</div>
<script src="{% static 'employee/search.js' %}"></script>
<script src="{% static 'basedOn.js' %}"></script>
@@ -576,6 +638,17 @@
$("#fieldContainerTable").find("[type=checkbox]").prop("checked",true).change()
}
function handleFormSubmit() {
$('#successMessage').show();
setTimeout(function() {
$('#successMessage').hide();
}, 3000);
return false; // Prevent the default form submission
}
</script>
<script>
function submitForm(elem) {

29
employee/templates/tabs/profile-asset-tab.html
View File

@@ -102,3 +102,32 @@
></div>
</div>
</div>
<div
class="oh-modal"
id="addAssetReport"
role="dialog"
aria-labelledby="addAssetReport"
aria-hidden="true"
style="z-index: 1022; "
>
<div class="oh-modal__dialog">
<div class="oh-modal__dialog-header">
<h2 class="oh-modal__dialog-title" id="addAssetReportLabel">
{% trans "Add Asset Report" %}
</h2>
<button
type="button"
class="oh-modal_close--custom"
onclick="$('#addAssetReport').removeClass('oh-modal--show');"
>
<ion-icon
name="close-outline"
role="img"
aria-label="close outline"
></ion-icon>
</button>
</div>
<div class="oh-modal__dialog-body" id="addAssetReportForm"></div>
</div>
</div>

10
employee/views.py
View File

@@ -2895,8 +2895,14 @@ def get_employees_birthday(_):
"name": name,
"dob": dob,
"daysUntilBirthday": days_till_birthday,
"department": emp.get_department().department,
"job_position": emp.get_job_position().job_position,
"department": (
emp.get_department().department if emp.get_department() else ""
),
"job_position": (
emp.get_job_position().job_position
if emp.get_job_position()
else ""
),
}
)
return JsonResponse({"birthdays": birthdays})