Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes of the HR module route and Finance module route #3573

Merged
merged 1 commit into from
Apr 17, 2024
Merged

fixes of the HR module route and Finance module route #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/js/components/Dashboard/EmployeeProfitabilityList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="card-body pt-3 h-325 w-md-389 w-389 overflow-y-scroll">
<ul class="list list-group unstyled-list">
<li class="d-flex justify-content-between">
<div class="text-secondary"> Fetching latest data... </div>
<div class="text-secondary"> Work in progress </div>
<h4 v-text="sentInvoiceCount"></h4>
</li>
<hr class="mt-1" />
Expand Down
6 changes: 3 additions & 3 deletions resources/views/hr/employees/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<thead class="thead-dark">
<tr class="sticky-top">
<th>Name</th>
@if($routeName === "employee")
@if($routeName === "employees")
<th>Active Projects Count</th>
<th>
Overall FTE
Expand All @@ -52,7 +52,7 @@
@else
<th>
Employee Earning
<span class="tooltip-wrapper" data-html="true" data-toggle="tooltip" title="Rate">
<span class="tooltip-wrapper" data-html="true" data-toggle="tooltip" title="Calculated on the basis of the total project and earnings of each project.">
<i class="fa fa-info-circle" aria-hidden="true"></i>
</span>
</th>
Expand Down Expand Up @@ -80,7 +80,7 @@ class="{{ config('constants.review-tags.completed.class') }} badge-pill mr-1 mb-
@endif
</a>
</td>
@if($routeName === "employee")
@if($routeName === "employees")
<td>
@if ($employee->user == null)
0
Expand Down
Loading