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.

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

JASPER 178: Court file search result #127

Merged
merged 8 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
540 changes: 149 additions & 391 deletions web/src/components/courtfilesearch/CourtFileSearchResult.vue

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<script lang="ts">
import { useCriminalFileStore } from '@/stores';
import { AdjudicatorRestrictionsInfoType } from '@/types/common';
import { type BTableSortBy } from 'bootstrap-vue-next';
import { defineComponent, onMounted, ref } from 'vue';

export default defineComponent({
Expand All @@ -54,7 +55,7 @@
[]
);

const sortBy = ref('adjudicator');
const sortBy = ref<BTableSortBy[]>(['adjudicator']);
const sortDesc = ref(false);
const isMounted = ref(false);

Expand Down
3 changes: 2 additions & 1 deletion web/src/components/criminal/CriminalDocumentsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
import { useCommonStore, useCriminalFileStore } from '@/stores';
import { ArchiveInfoType, DocumentRequestsInfoType } from '@/types/common';
import { CourtDocumentType, DocumentData } from '@/types/shared';
import { type BTableSortBy } from 'bootstrap-vue-next';
import {
computed,
defineComponent,
Expand Down Expand Up @@ -197,7 +198,7 @@
const loadingPdf = ref(false);
const activetab = ref('ALL');
// const tabIndex = ref(0);
const sortBy = ref('date');
const sortBy = ref<BTableSortBy[]>(['date']);
const sortDesc = ref(true);
// const hoverRow = ref(-1);
// const hoverCol = ref(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
<script lang="ts">
import { useCriminalFileStore } from '@/stores';
import { criminalAppearancesListType } from '@/types/criminal';
import { type BTableSortBy } from 'bootstrap-vue-next';
import { defineComponent, PropType, ref } from 'vue';
import CriminalAppearanceDetails from './CriminalAppearanceDetails.vue';

Expand All @@ -98,7 +99,7 @@
},
},
setup(props) {
const sortBy = ref('date');
const sortBy = ref<BTableSortBy[]>(['date']);
const sortDesc = ref(true);
const criminalFileStore = useCriminalFileStore();

Expand Down
3 changes: 2 additions & 1 deletion web/src/components/criminal/CriminalParticipants.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<script lang="ts">
import { useCriminalFileStore } from '@/stores';
import { participantListInfoType } from '@/types/criminal';
import { type BTableSortBy } from 'bootstrap-vue-next';
import { defineComponent, onMounted, ref } from 'vue';

export default defineComponent({
Expand All @@ -111,7 +112,7 @@

const isMounted = ref(false);
const numberOfParticipants = ref(0);
const sortBy = ref('name');
const sortBy = ref<BTableSortBy[]>(['name']);
const sortDesc = ref(false);

const fields = [
Expand Down
3 changes: 2 additions & 1 deletion web/src/components/criminal/CriminalPastAppearancesTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<script lang="ts">
import { useCriminalFileStore } from '@/stores';
import { criminalAppearancesListType } from '@/types/criminal';
import { type BTableSortBy } from 'bootstrap-vue-next';
import { defineComponent, PropType, ref } from 'vue';
import CriminalAppearanceDetails from './CriminalAppearanceDetails.vue';

Expand All @@ -108,7 +109,7 @@
},
setup(props) {
const criminalFileStore = useCriminalFileStore();
const sortBy = 'dateref';
const sortBy = ref<BTableSortBy[]>(['dateref']);
const sortDesc = ref(true);

const defaultStyles = {
Expand Down
3 changes: 2 additions & 1 deletion web/src/components/criminal/CriminalWitnesses.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
import { witnessCountInfoType, witnessListInfoType } from '@/types/criminal';
import { witnessType } from '@/types/criminal/jsonTypes';
import { computed, defineComponent, onMounted, ref } from 'vue';
import { type BTableSortBy } from 'bootstrap-vue-next';

export default defineComponent({
setup() {
Expand All @@ -119,7 +120,7 @@
let numberOfPersonnelWitnesses = 0;
let numberOfCivilianWitnesses = 0;
let numberOfExpertWitnesses = 0;
const sortBy = ref('name');
const sortBy = ref<BTableSortBy[]>(['name']);
const sortDesc = ref(false);
const selectedType = ref('Required Only');

Expand Down
7 changes: 4 additions & 3 deletions web/src/components/shared/table/ActionBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
color="#183a4a"
rounded
>
<v-app-bar-title class="px-5"
>{{ selected.length }} selected</v-app-bar-title
>
<v-app-bar-title class="px-5">
{{ selected.length }} selected
</v-app-bar-title>
<slot></slot>
</v-app-bar>
</div>
</template>
Expand Down
5 changes: 5 additions & 0 deletions web/src/plugins/vuetify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,10 @@ export default createVuetify({
dense: true,
variant: 'outlined',
},
VDataTable: {
hover: true,
showSelect: true,
returnObject: true,
}
},
});
Loading