diff --git a/src/components/DivContentTable.vue b/src/components/DivContentTable.vue new file mode 100644 index 0000000..835f5fe --- /dev/null +++ b/src/components/DivContentTable.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/components/DivError.vue b/src/components/DivError.vue index ff38056..4407662 100644 --- a/src/components/DivError.vue +++ b/src/components/DivError.vue @@ -1,5 +1,5 @@ + + diff --git a/src/views/capitalsource/ListCapitalsources.vue b/src/views/capitalsource/ListCapitalsources.vue index 8235237..567e5ca 100644 --- a/src/views/capitalsource/ListCapitalsources.vue +++ b/src/views/capitalsource/ListCapitalsources.vue @@ -17,82 +17,39 @@ -
-
-
-
- -
-
-
- - -
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - -
{{ $t("General.name") }}{{ $t("Capitalsource.type") }}{{ $t("Capitalsource.state") }}{{ $t("General.iban") }}{{ $t("General.bic") }}{{ $t("General.validFrom") }}{{ $t("General.validTil") }}{{ $t("Capitalsource.groupUse") }}{{ $t("Capitalsource.importAllowed") }}
-
-
+ + + + + + {{ $t("General.name") }} + {{ $t("Capitalsource.type") }} + {{ $t("Capitalsource.state") }} + {{ $t("General.iban") }} + {{ $t("General.bic") }} + {{ $t("General.validFrom") }} + {{ $t("General.validTil") }} + {{ $t("Capitalsource.groupUse") }} + {{ $t("Capitalsource.importAllowed") }} + + + + + + + @@ -102,6 +59,8 @@ import { onMounted, ref, useTemplateRef, watch } from "vue"; import { useCapitalsourceStore } from "@/stores/CapitalsourceStore"; import { useUserSessionStore } from "@/stores/UserSessionStore"; +import DivContentTable from "@/components/DivContentTable.vue"; +import DivFilter from "@/components/DivFilter.vue"; import CreateCapitalsourceModalVue from "@/components/capitalsource/CreateCapitalsourceModal.vue"; import DeleteCapitalsourceModalVue from "@/components/capitalsource/DeleteCapitalsourceModal.vue"; import ListCapitalsourceRowVue from "@/components/capitalsource/ListCapitalsourceRow.vue"; @@ -113,8 +72,11 @@ const validNow = ref(true); const capitalsources = ref(new Array()); const searchString = ref(""); -const createCapitalsourceModalList = useTemplateRef('createCapitalsourceModalList'); -const deleteModal = useTemplateRef('deleteModal'); +const createCapitalsourceModalList = useTemplateRef< + typeof CreateCapitalsourceModalVue +>("createCapitalsourceModalList"); +const deleteModal = + useTemplateRef("deleteModal"); const userId = useUserSessionStore().getUserId; @@ -122,10 +84,6 @@ const capitalsourceStore = useCapitalsourceStore(); const searchCapitalsources = capitalsourceStore.searchCapitalsources; const { capitalsource } = storeToRefs(capitalsourceStore); -watch(capitalsource, () => { - searchAllContent(); -}); - const showCreateCapitalsourceModal = () => { createCapitalsourceModalList.value?._show(); }; @@ -138,6 +96,19 @@ const editCapitalsource = (mcs: Capitalsource) => { createCapitalsourceModalList.value?._show(mcs); }; +watch(capitalsource, () => { + searchAllContent(); +}); + +watch(searchString, () => { + searchContent(); +}); + +const validNowToggled = (myValidNow: boolean) => { + validNow.value = myValidNow; + searchContent(); +}; + const searchAllContent = () => { searchString.value = ""; searchContent(); diff --git a/src/views/contractpartner/ListContractpartners.vue b/src/views/contractpartner/ListContractpartners.vue index 72603df..6c90dfd 100644 --- a/src/views/contractpartner/ListContractpartners.vue +++ b/src/views/contractpartner/ListContractpartners.vue @@ -19,78 +19,35 @@ -
-
-
-
- -
-
-
- - -
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - -
{{ $t("General.name") }}{{ $t("General.validFrom") }}{{ $t("General.validTil") }}{{ $t("Contractpartner.moneyflowComment") }}{{ $t("General.postingAccount") }}
-
-
+ + + + + + {{ $t("General.name") }} + {{ $t("General.validFrom") }} + {{ $t("General.validTil") }} + {{ $t("Contractpartner.moneyflowComment") }} + {{ $t("General.postingAccount") }} + + + + + + + @@ -99,6 +56,8 @@ import { onMounted, ref, watch } from "vue"; import { useContractpartnerStore } from "@/stores/ContractpartnerStore"; +import DivContentTable from "@/components/DivContentTable.vue"; +import DivFilter from "@/components/DivFilter.vue"; import CreateContractpartnerModalVue from "@/components/contractpartner/CreateContractpartnerModal.vue"; import DeleteContractpartnerModalVue from "@/components/contractpartner/DeleteContractpartnerModal.vue"; import ListContractpartnerAccountsModal from "@/components/contractpartneraccount/ListContractpartnerAccountsModal.vue"; @@ -112,18 +71,18 @@ const validNow = ref(true); const contractpartners = ref(new Array()); const searchString = ref(""); -const createContractpartnerModalList = useTemplateRef('createContractpartnerModalList'); -const deleteModal = useTemplateRef('deleteModal'); -const accountsModal = useTemplateRef('accountsModal'); +const createContractpartnerModalList = useTemplateRef< + typeof CreateContractpartnerModalVue +>("createContractpartnerModalList"); +const deleteModal = + useTemplateRef("deleteModal"); +const accountsModal = + useTemplateRef("accountsModal"); const contractpartnerStore = useContractpartnerStore(); const searchContractpartners = contractpartnerStore.searchContractpartners; const { contractpartner } = storeToRefs(contractpartnerStore); -watch(contractpartner, () => { - searchAllContent(); -}); - const showCreateContractpartnerModal = () => { createContractpartnerModalList.value?._show(); }; @@ -136,6 +95,19 @@ const editContractpartner = (mcs: Contractpartner) => { createContractpartnerModalList.value?._show(mcs); }; +watch(contractpartner, () => { + searchAllContent(); +}); + +watch(searchString, () => { + searchContent(); +}); + +const validNowToggled = (myValidNow: boolean) => { + validNow.value = myValidNow; + searchContent(); +}; + const searchAllContent = () => { searchString.value = ""; searchContent(); diff --git a/src/views/etf/ListEtfs.vue b/src/views/etf/ListEtfs.vue index 18c4825..4f39453 100644 --- a/src/views/etf/ListEtfs.vue +++ b/src/views/etf/ListEtfs.vue @@ -18,86 +18,58 @@ -
-
-
-
- -
-
-
- - -
-
-
-
-
+ -
-
- - - - - - - - - - - - - - - - - - - - - - -
{{ $t("General.name") }}{{ $t("ETF.isin") }}{{ $t("ETF.wkn") }}{{ $t("ETF.ticker") }} - {{ $t("ETFFlow.transactionCosts") }} - - {{ $t("ETF.partialTaxExemptionSmall") }} - - -
{{ $t("ETFFlow.transactionCostsAbsolute") }}{{ $t("ETFFlow.transactionCostsRelative") }}{{ $t("ETFFlow.transactionCostsMaximum") }}
-
-
+ + + + + {{ $t("General.name") }} + {{ $t("ETF.isin") }} + {{ $t("ETF.wkn") }} + {{ $t("ETF.ticker") }} + + {{ $t("ETFFlow.transactionCosts") }} + + + {{ $t("ETF.partialTaxExemptionSmall") }} + + + + + + + + {{ $t("ETFFlow.transactionCostsAbsolute") }} + {{ $t("ETFFlow.transactionCostsRelative") }} + {{ $t("ETFFlow.transactionCostsMaximum") }} + + + + + +