mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2026-03-16 10:57:45 +00:00
Merge branch '1943-1890-1855-1658-1940-fix-features-and-adjust-layout' into 'ticket-app-master'
Fix, features et modifications UI See merge request Chill-Projet/chill-bundles!944
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ComputedRef } from "vue";
|
||||
import { computed, ComputedRef, onMounted } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import TabTable from "./TabTable.vue";
|
||||
import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
|
||||
@@ -82,6 +82,7 @@ import {
|
||||
CONFIDENTIAL,
|
||||
trans,
|
||||
} from "translator";
|
||||
import { HomepageTabs } from "ChillMainAssets/types";
|
||||
import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
||||
|
||||
const store = useStore();
|
||||
@@ -103,6 +104,12 @@ const noResults = computed(() => {
|
||||
function getUrl(c: { id: number }): string {
|
||||
return `/fr/parcours/${c.id}`;
|
||||
}
|
||||
onMounted(() => {
|
||||
store.dispatch("getByTab", {
|
||||
tab: HomepageTabs.MyAccompanyingCourses,
|
||||
param: "",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed } from "vue";
|
||||
import { computed, onMounted } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import TabTable from "./TabTable.vue";
|
||||
import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
|
||||
@@ -112,6 +112,7 @@ import {
|
||||
trans,
|
||||
} from "translator";
|
||||
import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
||||
import { HomepageTabs } from "ChillMainAssets/types";
|
||||
|
||||
const evaluations: ComputedRef<
|
||||
PaginationResponse<AccompanyingPeriodWorkEvaluation>
|
||||
@@ -150,6 +151,12 @@ function getUrl(
|
||||
}
|
||||
return "";
|
||||
}
|
||||
onMounted(() => {
|
||||
store.dispatch("getByTab", {
|
||||
tab: HomepageTabs.MyEvaluations,
|
||||
param: "",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ComputedRef } from "vue";
|
||||
import { computed, ComputedRef, onMounted } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import TabTable from "./TabTable.vue";
|
||||
import { Notification } from "ChillPersonAssets/types";
|
||||
@@ -66,6 +66,7 @@ import {
|
||||
} from "translator";
|
||||
import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
|
||||
import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
||||
import { HomepageTabs } from "ChillMainAssets/types";
|
||||
|
||||
const store = useStore();
|
||||
|
||||
@@ -121,6 +122,12 @@ function getEntityUrl(n: Notification): string {
|
||||
throw "notification type unknown";
|
||||
}
|
||||
}
|
||||
onMounted(() => {
|
||||
store.dispatch("getByTab", {
|
||||
tab: HomepageTabs.MyNotifications,
|
||||
param: "",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ComputedRef } from "vue";
|
||||
import { computed, ComputedRef, onMounted } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import TabTable from "./TabTable.vue";
|
||||
import {
|
||||
@@ -95,6 +95,7 @@ import {
|
||||
import { TasksState } from "./store/modules/homepage";
|
||||
import { Alert, Warning } from "ChillPersonAssets/types";
|
||||
import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
||||
import { HomepageTabs } from "ChillMainAssets/types";
|
||||
|
||||
const store = useStore();
|
||||
|
||||
@@ -123,6 +124,12 @@ const noResultsWarning = computed(() => {
|
||||
function getUrl(t: Warning | Alert): string {
|
||||
return `/fr/task/single-task/${t.id}/show`;
|
||||
}
|
||||
onMounted(() => {
|
||||
store.dispatch("getByTab", {
|
||||
tab: HomepageTabs.MyTasks,
|
||||
param: "",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed } from "vue";
|
||||
import { computed, onMounted } from "vue";
|
||||
import { useStore } from "vuex";
|
||||
import MyWorkflowsTable from "./MyWorkflowsTable.vue";
|
||||
import {
|
||||
@@ -19,9 +19,16 @@ import {
|
||||
MY_WORKFLOWS_DESCRIPTION_CC,
|
||||
trans,
|
||||
} from "translator";
|
||||
import { HomepageTabs } from "ChillMainAssets/types";
|
||||
|
||||
const store = useStore();
|
||||
|
||||
const workflows = computed(() => store.state.homepage.workflows);
|
||||
const workflowsCc = computed(() => store.state.homepage.workflowsCc);
|
||||
onMounted(() => {
|
||||
store.dispatch("getByTab", {
|
||||
tab: HomepageTabs.MyWorkflows,
|
||||
param: "",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user