diff --git a/asset/static/src/asset/dashboard.js b/asset/static/src/asset/dashboard.js index d8f4fd049..ed9e860e4 100644 --- a/asset/static/src/asset/dashboard.js +++ b/asset/static/src/asset/dashboard.js @@ -84,7 +84,7 @@ function emptyAssetAvialabeChart(assetAvailableChartChart, args, options) { var noDataImage = new Image(); noDataImage.src = assetAvailableChartChart.data.emptyImageSrc ? assetAvailableChartChart.data.emptyImageSrc - : staticUrl + "images/ui/joiningchart.png"; + : staticUrl + "images/ui/no_records.svg"; message = assetAvailableChartChart.data.message ? assetAvailableChartChart.data.message diff --git a/asset/templates/asset/dashboard.html b/asset/templates/asset/dashboard.html index 8b6181625..20a8d5e58 100644 --- a/asset/templates/asset/dashboard.html +++ b/asset/templates/asset/dashboard.html @@ -90,15 +90,9 @@
{% trans "Asset Requests To Approve" %}
-
- {% if asset_requests %} - {% include "asset/dashboard_asset_requests.html" %} - {% else %} -
- Page not found. 404. -
{% trans "There is no asset request to approve." %}
-
- {% endif %} +
+
@@ -119,16 +113,10 @@
{% trans "Allocated Assets" %}
-
- {% if asset_allocations %} - {% include "asset/dashboard_allocated_assets.html" %} - {% else %} -
- Page not found. 404. -
{% trans "There is no asset allocation at this moment." %}
-
- - {% endif %} +
+ +
+
diff --git a/asset/templates/asset/dashboard_allocated_assets.html b/asset/templates/asset/dashboard_allocated_assets.html index 7f621ffb6..555a6b56f 100644 --- a/asset/templates/asset/dashboard_allocated_assets.html +++ b/asset/templates/asset/dashboard_allocated_assets.html @@ -1,47 +1,41 @@ {% load i18n %} - -
-
-
-
-
{% trans "Allocated User" %}
-
{% trans "Asset" %}
-
{% trans "Assigned Date" %}
+{% load static %} +{% if asset_allocations %} +
+
+
+
+
{% trans "Allocated User" %}
+
{% trans "Asset" %}
+
{% trans "Assigned Date" %}
+
-
-
- {% for asset_allocation in asset_allocations %} -
-
-
-
- +
+ {% for asset_allocation in asset_allocations %} +
+
+
+
+ +
+ {{asset_allocation.assigned_to_employee_id}} +
+
+
+ {{asset_allocation.asset_id}} +
+
+ {{asset_allocation.assigned_date}}
- {{asset_allocation.assigned_to_employee_id}}
-
-
- {{asset_allocation.asset_id}} -
-
- {{asset_allocation.assigned_date}} -
+ {% endfor %}
- - {% endfor %}
-
+{% else %} +
+ Page not found. 404. +
{% trans "There is no asset allocation at this moment." %}
+
+{% endif %} diff --git a/asset/templates/asset/dashboard_asset_requests.html b/asset/templates/asset/dashboard_asset_requests.html index faf59def7..c29f1239c 100644 --- a/asset/templates/asset/dashboard_asset_requests.html +++ b/asset/templates/asset/dashboard_asset_requests.html @@ -1,91 +1,105 @@ {% load i18n %} -
-
-
-
-
{% trans "Request User" %}
-
{% trans "Asset Category" %}
-
{% trans "Request Date" %}
-
{% trans "Status" %}
- {% if perms.asset.add_assetassignment %} -
- {% endif %} -
-
-
-
- {% for asset_request in asset_requests %} - -
-
-
-
- Mary Magdalene -
- {{asset_request.requested_employee_id}} - -
-
-
- {{asset_request.asset_category_id}} -
-
- {{ asset_request.asset_request_date }} -
-
-
- {% trans asset_request.asset_request_status %} -
-
- {% if perms.asset.add_assetassignment %} - {% if asset_request.asset_request_status == 'Requested' %} -
-
- - - -
- {% csrf_token %} - -
-
-
+{% load static %} +{% if messages %} + +{% endif %} +{% if asset_requests %} +
+
+
+
+
{% trans "Request User" %}
+
{% trans "Asset Category" %}
+
{% trans "Request Date" %}
+
{% trans "Status" %}
+ {% if perms.asset.add_assetassignment %} +
{% endif %} - {% endif %} +
+
+
+
+ {% for asset_request in asset_requests %} + +
+
+
+
+ Mary Magdalene +
+ {{asset_request.requested_employee_id}} + +
+
+
+ {{asset_request.asset_category_id}} +
+
+ {{ asset_request.asset_request_date }} +
+
+
+ {% trans asset_request.asset_request_status %} +
+
+ {% if perms.asset.add_assetassignment %} + {% if asset_request.asset_request_status == 'Requested' %} +
+
+ + + +
+ {% csrf_token %} + +
+
+
+ {% endif %} + {% endif %} +
+ {% endfor %}
- {% endfor %}
-
+{% else %} +
+

+ + {% trans "No records available at the moment." %} +

+
+{% endif %} diff --git a/asset/templates/request_allocation/asset_request_allocation_list.html b/asset/templates/request_allocation/asset_request_allocation_list.html index 0532e76b2..5db7593c7 100644 --- a/asset/templates/request_allocation/asset_request_allocation_list.html +++ b/asset/templates/request_allocation/asset_request_allocation_list.html @@ -237,9 +237,11 @@ -
+ {% csrf_token %} -
-
-
- {% endif %} -
- {% endfor %} -
-
-
-{% else %} -
-
- -

{% trans "No data Found..." %}

-
-
-{% endif %} diff --git a/templates/dashboard.html b/templates/dashboard.html index 88c826fea..cee5f53ed 100755 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -185,464 +185,7 @@
{% endif %}
- {% if "attendance"|app_installed %} - {% if not 'offline_employees' in charts %} - {% if perms.employee.view_employee or request.user|is_reportingmanager %} -
- {% include "dashboard/not_in_yet.html" %} -
- {% endif %} - {% endif %} - {% if not 'online_employees' in charts %} - {% if perms.employee.view_employee or request.user|is_reportingmanager %} -
- {% include "dashboard/not_out_yet.html" %} -
- {% endif %} - {% endif %} - {% endif %} - {% if "leave"|app_installed and not 'overall_leave_chart' in charts %} - {% if perms.leave.view_leaverequest %} -
-
-
- {% trans "Overall Leave" %} - - close - - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if "recruitment"|app_installed and perms.recruitment.view_candidate or request.user|is_stagemanager %} - {% if not 'hired_candidates' in charts %} -
-
-
- {% trans "Hired Candidates" %} - - close - -
-
- -
-
-
- {% endif %} - {% if "onboarding"|app_installed and not 'onboarding_candidates' in charts %} -
-
-
- {% trans "Candidates Started Onboarding" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if "recruitment"|app_installed and not 'recruitment_analytics' in charts %} - {% if request.user|is_stagemanager or perms.recruitment.view_recruitment %} -
-
-
- {% trans "Recruitment Analytics" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if "attendance"|app_installed and not 'attendance_analytic' in charts %} - {% if request.user|is_reportingmanager or perms.attendance.view_attendance %} -
-
-
-
- {% trans "Attendance Analytics" %} - - close - -
-
- - - - -
-
-
- -
-
-
- {% endif %} - {% endif %} - {% if "attendance"|app_installed and not 'hours_chart' in charts %} - {% if request.user|is_reportingmanager or perms.attendance.view_attendance %} -
-
-
-
- {% trans "Hours Chart" %} - - close - -
-
- -
-
- -
-
-
-
- {% endif %} - {% endif %} - {% if not 'employees_chart' in charts %} - {% if 'employees_chart'|feature_is_accessible:request or perms.employee.view_employee or request.user|is_reportingmanager %} -
-
-
- {% trans "Employees Chart" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if not 'department_chart' in charts %} - {% if 'department_chart'|feature_is_accessible:request or perms.employee.view_employee or request.user|is_reportingmanager %} -
-
-
- {% trans "Department Chart" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if not 'gender_chart' in charts %} - {% if 'gender_chart'|feature_is_accessible:request or perms.employee.view_employee or request.user|is_reportingmanager %} -
-
-
- {% trans "Gender Chart" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if not 'objective_status' in charts and "pms"|app_installed %} -
-
-
- {% trans "Objective Status" %} - - close - -
-
- -
-
-
- {% endif %} - {% if "pms"|app_installed and not 'key_result_status' in charts %} - {% if perms.pms.view_employeekeyresult or request.user|is_reportingmanager %} -
-
-
- {% trans "Key Result Status" %} - - close - -
-
- -
-
-
- {% endif %} - {% endif %} - {% if "pms"|app_installed and not 'feedback_status' in charts %} - {% if perms.pms.view_feedback or request.user|is_reportingmanager %} -
-
-
- {% trans "Feedback Status" %} - - close - -
-
-
- -
-
-
-
- {% endif %} - {% endif %} - {% if not 'shift_request_approve' in charts %} - {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %} -
-
-
- {% trans "Shift Requests To Approve" %} - - close - -
-
- {% include "request_and_approve/shift_request.html" %} -
-
-
- {% endif %} - {% endif %} - {% if not 'work_type_request_approve' in charts %} - {% if perms.base.change_worktyperequest or request.user|is_reportingmanager %} -
-
-
- {% trans "Work Type Requests To Approve" %} - - close - -
-
- {% include "request_and_approve/work_type_request.html" %} -
-
-
- {% endif %} - {% endif %} - {% if "attendance"|app_installed and not 'overtime_approve' in charts %} - {% if perms.attendance.change_attendance or request.user|is_reportingmanager %} -
-
- {% include "request_and_approve/overtime_approve.html" %} -
-
- {% endif %} - {% endif %} - {% if "attendance"|app_installed %} - {% if not 'attendance_validate' in charts %} - {% if perms.attendance.change_attendance or request.user|is_reportingmanager %} -
-
- {% include "request_and_approve/attendance_validate.html" %} -
-
- {% endif %} - {% endif %} - {% endif %} - {% if "leave"|app_installed and not 'leave_request_approve' in charts %} - {% if perms.leave.change_leaverequest or request.user|is_reportingmanager %} -
-
-
- {% trans "Leave Requests To Approve" %} - - close - -
-
-
-
-
- {% endif %} - {% endif %} - {% if "leave"|app_installed and not 'leave_allocation_approve' in charts %} - {% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %} -
-
-
- {% trans "Leave Allocation Request To Approve" %} - - close - -
-
- {% include "request_and_approve/leave_request_approve.html" %} -
-
-
- {% endif %} - {% endif %} - {% if "pms"|app_installed and not 'feedback_answer' in charts %} -
-
-
- {% trans "Feedback To Answers" %} - - close - -
-
- {% include "request_and_approve/feedback_answer.html" %} -
-
-
- {% endif %} - {% if "asset"|app_installed and not 'asset_request_approve' in charts %} - {% if perms.asset.change_assetrequest or request.user|is_reportingmanager %} -
-
-
- {% trans "Asset Requests To Approve" %} - - close - -
-
- {% include "request_and_approve/asset_requests_approve.html" %} -
-
-
- {% endif %} - {% endif %} + {% include "dashboard_tile_container.html" %}
@@ -665,7 +208,7 @@ justify-content: center; width: 50px; height: 28px;" class="oh-btn oh-btn--secondary-outline float-end ms-3" - hx-get='{% url "create-announcement" %}' hx-target="#objectCreateModalTarget" + hx-get="{% url 'create-announcement' %}" hx-target="#objectCreateModalTarget" hx-swap="innerHTML" data-toggle="oh-modal-toggle" data-target="#objectCreateModal" title='{% trans "Create Announcement." %}'> @@ -889,7 +432,7 @@ localStorage.setItem("tileOrder", JSON.stringify( [ "notInYetId", "LeaveApprove", "shiftRequestApprove", "WorkTypeRequestApprove", "AttendanceValidate", "OTApprove", - "LeaveAllocationApprove", "feedbackAnswer", "assetRequestApprove", "movable8", "pendingHours", "notoutYetdd", + "LeaveAllocationApprove", "feedbackAnswer", "assetRequestApprove", "movable8", "pendingHours", "notoutYetId", "movable2", "movable3", "movable4", "movable1", "movable5", "movable6", "movable7", "movable9", "movable10", "movable11" ] ))