Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46cb7f1a16 | ||
| b934f4d81f | |||
| 77c1cdcbbd |
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.1.82'
|
app.version: '0.1.83'
|
||||||
|
|||||||
@@ -25,19 +25,7 @@
|
|||||||
@change="onBulkValidationChange"
|
@change="onBulkValidationChange"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span v-else-if="isSiteManager" class="inline-flex items-center gap-2">
|
<span v-else-if="!isSiteManager">Site <Icon name="mdi:check-bold" class="ml-1"/></span>
|
||||||
<span>Site</span>
|
|
||||||
<input
|
|
||||||
ref="bulkSiteValidationInput"
|
|
||||||
:checked="isBulkSiteValidationChecked"
|
|
||||||
type="checkbox"
|
|
||||||
class="h-4 w-4"
|
|
||||||
:class="canBulkToggleSiteValidation ? 'cursor-pointer' : 'cursor-not-allowed opacity-50'"
|
|
||||||
:disabled="!canBulkToggleSiteValidation"
|
|
||||||
@change="onBulkSiteValidationChange"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<span v-else>Site <Icon name="mdi:check-bold" class="ml-1"/></span>
|
|
||||||
<span v-if="!isAdmin">RH <Icon name="mdi:check-bold" class="ml-1"/></span>
|
<span v-if="!isAdmin">RH <Icon name="mdi:check-bold" class="ml-1"/></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -147,16 +135,8 @@
|
|||||||
@change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
@change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="text-right p-5">
|
<div v-else-if="!isSiteManager" class="text-right p-5">
|
||||||
<input
|
<span v-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
|
||||||
v-if="isSiteManager"
|
|
||||||
:checked="rows[employee.id]?.isSiteValid ?? false"
|
|
||||||
type="checkbox"
|
|
||||||
class="h-4 w-4 cursor-pointer"
|
|
||||||
:disabled="(!canToggleSiteValidation(employee.id) && !canCreateSiteValidationRowFromAbsence(employee.id)) || isSiteValidationPending(employee.id)"
|
|
||||||
@change="onToggleSiteValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
|
||||||
/>
|
|
||||||
<span v-else-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
|
|
||||||
<span v-else class="text-xs text-neutral-500">-</span>
|
<span v-else class="text-xs text-neutral-500">-</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!isAdmin">
|
<div v-if="!isAdmin">
|
||||||
|
|||||||
@@ -26,19 +26,7 @@
|
|||||||
@change="onBulkValidationChange"
|
@change="onBulkValidationChange"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span v-else-if="isSiteManager" class="inline-flex items-center gap-2">
|
<span v-else-if="!isSiteManager">Site <Icon name="mdi:check-bold" class="ml-1"/></span>
|
||||||
<span>Site</span>
|
|
||||||
<input
|
|
||||||
ref="bulkSiteValidationInput"
|
|
||||||
:checked="isBulkSiteValidationChecked"
|
|
||||||
type="checkbox"
|
|
||||||
class="h-4 w-4"
|
|
||||||
:class="canBulkToggleSiteValidation ? 'cursor-pointer' : 'cursor-not-allowed opacity-50'"
|
|
||||||
:disabled="!canBulkToggleSiteValidation"
|
|
||||||
@change="onBulkSiteValidationChange"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<span v-else>Site <Icon name="mdi:check-bold" class="ml-1"/></span>
|
|
||||||
<span v-if="!isAdmin">RH <Icon name="mdi:check-bold" class="ml-1"/></span>
|
<span v-if="!isAdmin">RH <Icon name="mdi:check-bold" class="ml-1"/></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -181,16 +169,8 @@
|
|||||||
@change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
@change="onToggleValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="text-right p-5">
|
<div v-else-if="!isSiteManager" class="text-right p-5">
|
||||||
<input
|
<span v-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
|
||||||
v-if="isSiteManager"
|
|
||||||
:checked="rows[employee.id]?.isSiteValid ?? false"
|
|
||||||
type="checkbox"
|
|
||||||
class="h-4 w-4 cursor-pointer"
|
|
||||||
:disabled="(!canToggleSiteValidation(employee.id) && !canCreateSiteValidationRowFromAbsence(employee.id)) || isSiteValidationPending(employee.id)"
|
|
||||||
@change="onToggleSiteValidation(employee.id, ($event.target as HTMLInputElement).checked)"
|
|
||||||
/>
|
|
||||||
<span v-else-if="rows[employee.id]?.isSiteValid" class="text-xs font-semibold text-neutral-700">Validé</span>
|
|
||||||
<span v-else class="text-xs text-neutral-500">-</span>
|
<span v-else class="text-xs text-neutral-500">-</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!isAdmin">
|
<div v-if="!isAdmin">
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export const useDriverHoursPage = () => {
|
|||||||
|
|
||||||
const dayGridCols = computed(() => {
|
const dayGridCols = computed(() => {
|
||||||
const metricCol = '0.4fr'
|
const metricCol = '0.4fr'
|
||||||
const validationCols = isAdmin.value ? `${metricCol}` : `${metricCol} ${metricCol}`
|
const validationCols = isAdmin.value || isSiteManager.value ? `${metricCol}` : `${metricCol} ${metricCol}`
|
||||||
return `1.2fr 0.6fr 0.8fr 0.8fr 0.8fr ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
|
return `1.2fr 0.6fr 0.8fr 0.8fr 0.8fr ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ export const useHoursPage = () => {
|
|||||||
|
|
||||||
const dayGridCols = computed(() => {
|
const dayGridCols = computed(() => {
|
||||||
const metricCol = '0.4fr'
|
const metricCol = '0.4fr'
|
||||||
const validationCols = isAdmin.value ? `${metricCol}` : `${metricCol} ${metricCol}`
|
const validationCols = isAdmin.value || isSiteManager.value ? `${metricCol}` : `${metricCol} ${metricCol}`
|
||||||
return `1.2fr 0.6fr repeat(6, 0.8fr) ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
|
return `1.2fr 0.6fr repeat(6, 0.8fr) ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user