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

client issue fixed in all timesheets #2890

Merged
merged 1 commit into from
Jan 9, 2025
Merged

client issue fixed in all timesheets #2890

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
34 changes: 21 additions & 13 deletions app/Domain/Timesheets/Templates/showAll.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

@section('content')

<script type="text/javascript">
<script type="module">

import "@mix('/js/Domain/Timesheets/Js/timesheetsController.js')"
import "@mix('/js/components/datePickers.module.js')"

jQuery(document).ready(function(){
jQuery("#checkAllEmpl").change(function(){
jQuery(".invoicedEmpl").prop('checked', jQuery(this).prop("checked"));
Expand Down Expand Up @@ -37,13 +41,13 @@
}
});

leantime.timesheetsController.initTimesheetsTable();
timesheetsController.initTimesheetsTable();

<?php if ($login::userIsAtLeast($roles::$manager)) { ?>
leantime.timesheetsController.initEditTimeModal();
<?php } ?>
// <?php if ($login::userIsAtLeast($roles::$manager)) { ?>
// timesheetsController.initEditTimeModal();
// <?php } ?>

leantime.dateController.initDateRangePicker(".dateFrom", ".dateTo", 1)
datePickers.initDateRangePicker(".dateFrom", ".dateTo", 1);
});
</script>

Expand Down Expand Up @@ -74,10 +78,10 @@
<select name="clientId">
<option value="-1"><?php echo strip_tags($tpl->__("menu.all_clients")) ?></option>
<?php foreach ($tpl->get('allClients') as $client) {?>
<option value="<?=$client['id'] ?>"
<?php if ($tpl->get('clientFilter') == $client['id']) {
<option value="<?=$client->id ?>"
<?php if ($tpl->get('clientFilter') == $client->id) {
echo "selected='selected'";
} ?>><?=$tpl->escape($client['name'])?></option>
} ?>><?=$tpl->escape($client->name)?></option>
<?php } ?>
</select>
</td>
Expand Down Expand Up @@ -116,8 +120,7 @@
?>
</select>
</td>
<td>

{{-- <td>

<x-global::forms.select name="userId" id="userId" labelText="{{ __('label.all_employees') }}" style="max-width:120px;" onchange="submit();">
<x-global::forms.select.select-option value="all">{{ __('label.all_employees') }}</x-global::forms.select.select-option>
Expand All @@ -131,13 +134,14 @@
@endforeach
</x-global::forms.select>

</td>
</td> --}}
<td>
<x-global::forms.checkbox
labelText="{{ __('label.invoiced') }}"
labelPosition="right"
name="invEmpl"
id="invEmpl"
size="xs"
value="on"
:checked="$tpl->get('invEmpl') == '1'"
onclick="submit();"
Expand All @@ -149,6 +153,7 @@
labelPosition="right"
name="invComp"
id="invComp"
size="xs"
value="on"
:checked="$tpl->get('invComp') == '1'"
onclick="submit();"
Expand All @@ -161,14 +166,17 @@
labelPosition="right"
name="paid"
id="paid"
size="xs"
value="on"
:checked="$tpl->get('paid') == '1'"
onclick="submit();"
/>
</td>
<td>
<input type="hidden" name='filterSubmit' value="1"/>
<input type="submit" value="<?php echo $tpl->__('buttons.search')?>" class="reload" />
<x-global::forms.button content-role="ghost" type="submit" class="reload" >
{{ __('buttons.search') }}
</x-global::forms.button>
</td>
</tr>
</table>
Expand Down
Loading