Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix/task 76815 76921 #120

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Fix/task 76815 76921 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4ee8d9
fix: overlay is displayed over the time tracker drawer - EXO-76815
rdenarie Feb 10, 2025
91ea869
fix: Tables in eXo are not correctly displayed in width - EXO-76815
rdenarie Feb 10, 2025
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
7 changes: 4 additions & 3 deletions time-tracker-webapps/src/main/webapp/css/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ div#middle-topNavigation-container .UIIntermediateContainer > .UIRowContainer {
#activityManagementApp {
padding: 10px;
}
.theme--light.v-data-table {
width: 100% !important;
}


@media (max-width: 1024px) {
.timeTrackingApp .uiApplicationIconButton {
Expand All @@ -27,6 +25,9 @@ div#middle-topNavigation-container .UIIntermediateContainer > .UIRowContainer {
.drawerContent {
padding: 16px !important;
}
.theme--light.v-data-table {
width: 100% !important;
}
}

#activityManagementApp {
Expand Down
19 changes: 9 additions & 10 deletions time-tracker-webapps/src/main/webapp/vue-app/components/timetracking/TimeTrackingDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<exo-drawer
ref="timeTrackerDrawer"
right
attached
class="logTimeDrawer">
<template slot="title">
{{ $t("exo.timeTracker.timeTracking.timeTrackingDrawer.toolbarTitle") }}
Expand Down Expand Up @@ -44,23 +43,23 @@
@input="activityRecordMenuDatePicker = false" />
</v-menu>
</div>
<div
align="center"
<div
align="center"
justify="center">
<h4 :class="itemRowBackground">
{{ $t("exo.timeTracker.timeTracking.timeTrackingDrawer.text.totlal") }}
{{ total }}
</h4>
</div>

<div align="center" justify="center">
<v-list v-if="activityRecords.length > 0" class="actList">
<v-list-item
v-for="(item,i) in activityRecords"
:key="i"
class="actItem pr-n6">
<v-tooltip
bottom
bottom
max-width="200px">
<template v-slot:activator="{ on, attrs }">
<v-list-item-content
Expand All @@ -73,7 +72,7 @@
v-text="item.activity.label" />
<span class=" TimeTrackingDrawerSpan d-inline-block text-truncate text-left mb-n2">
<v-list-item-subtitle v-text="item.description" />
</span>
</span>
</v-list-item-content>
</template>
<span class="TimeTrackingDrawerSpan text-left text-justify text-break">{{ item.description }}</span>
Expand All @@ -85,7 +84,7 @@
class="d-flex align-self-start"
close-on-click
close-on-content-click
bottom
bottom
attach
nudge-bottom="29"
left>
Expand All @@ -101,14 +100,14 @@
</v-btn>
</template>
<v-list class="text-left TTbackgroundList mt-n2" ref="TTlistRef">
<v-list-item
<v-list-item
@click="editActivityRecord(item)">
<v-list-item-title class="subtitle-2">
<i class="uiIcon uiIconEdit"></i>
{{ $t("exo.timeTracker.teams.teamsList.edit") }}
</v-list-item-title>
</v-list-item>
<v-list-item
<v-list-item
@click="deleteActivityRecord(item.id)">
<v-list-item-title class="subtitle-2">
<i class="uiIcon uiIconTrash"></i>
Expand All @@ -132,7 +131,7 @@
</v-list>
</div>
<div>
<v-btn
<v-btn
class="TTDrawerButtonAdd"
block
large
Expand Down