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.

Sign up for GitHub

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

Combo of banks shows url and not name in accountscrud #454

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Combo of banks shows url and not name in accountscrud #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
704ba18
npm update 0
turulomio Oct 16, 2024
4f66ffa
Fixing problem with inactive banks visibility
turulomio Oct 16, 2024
4a3e105
Trying
turulomio Oct 16, 2024
00122ef
Trying test
turulomio Oct 16, 2024
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
2 changes: 1 addition & 1 deletion cypress/e2e/AssetsReport.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('e2e Assets Report', () => {
cy.getDataTest('Settings_ButtonSave').click()

cy.getDataTest('LateralAssetsReport').click()
cy.getDataTest('AssetsReport_ButtonGenerate').click()
cy.getDataTest('AssetsReport_ButtonGenerate', { timeout: 100000 }).click()
cy.getDataTest('AssetsReport_ButtonGenerate', { timeout: 100000 }).should("be.enabled")
})

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/StrategiesList.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('e2e Strateegies List', () => {
cy.getDataTest('MyMenuInline_Header0_Item0').click()
cy.getDataTest('StrategyCU_Name').type("Range strategy")
cy.getDataTest('StrategyCU_Investments').type("Cash{downArrow}{enter}")
cy.getDataTest('StrategyCU_Type').click().type("pr{downArrow}{enter}")
cy.getDataTest('StrategyCU_Type').type("{downArrow}{downArrow}{enter}")
cy.wait(1000) // A lot of products, needed more time
cy.getDataTest('StrategyCU_Products').type("Apalanc{downArrow}{enter}")
cy.getDataTest('StrategyCU_Comment').type("My strategy comment")
Expand Down
2,766 changes: 1,188 additions & 1,578 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@
"dependencies": {
"@cypress/vue": "^6.0.1",
"@mdi/font": "^7.4.47",
"axios": "^1.7.4",
"axios": "^1.7.7",
"currency-list": "^1.0.8",
"echarts": "^5.5.1",
"echarts-stat": "^1.2.0",
"flag-icons": "^7.2.3",
"lodash-es": "^4.17.21",
"moment-timezone": "^0.5.45",
"moment-timezone": "^0.5.46",
"pdfmake": "^0.3.0-beta.8",
"pinia": "^2.2.2",
"pinia": "^2.2.4",
"roboto-fontface": "*",
"vue": "^3.4.38",
"vue-i18n": "^9.14.0",
"vue": "^3.5.12",
"vue-i18n": "^10.0.4",
"vue-i18n-extract": "github:Spittal/vue-i18n-extract",
"vue-router": "^4.4.3",
"vuetify": "^3.7.0",
"vue-router": "^4.4.5",
"vuetify": "^3.7.2",
"vuetify_rules": "^0.7.0",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@cypress/code-coverage": "^3.12.45",
"@cypress/vite-dev-server": "^5.1.1",
"@eslint/js": "^9.9.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitest/coverage-v8": "^2.0.5",
"@vitest/ui": "^2.0.5",
"@cypress/code-coverage": "^3.13.4",
"@cypress/vite-dev-server": "^5.2.0",
"@eslint/js": "^9.12.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vitest/coverage-v8": "^2.1.3",
"@vitest/ui": "^2.1.3",
"@vue/test-utils": "^2.4.6",
"cypress": "^13.13.3",
"eslint": "^9.9.0",
"eslint-plugin-cypress": "^3.5.0",
"eslint-plugin-vue": "^9.27.0",
"globals": "^15.9.0",
"npm-check-updates": "^17.1.0",
"vite": "^5.4.2",
"cypress": "^13.15.0",
"eslint": "^9.12.0",
"eslint-plugin-cypress": "^4.0.0",
"eslint-plugin-vue": "^9.29.0",
"globals": "^15.11.0",
"npm-check-updates": "^17.1.3",
"vite": "^5.4.9",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-istanbul": "^6.0.2",
"vite-plugin-vue-devtools": "^7.3.8",
"vite-plugin-vue-devtools": "^7.4.6",
"vite-plugin-vuetify": "^2.0.4",
"vitest": "^2.0.5"
"vitest": "^2.1.3"
}
}
10 changes: 8 additions & 2 deletions src/components/AccountsCU.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
<h1>{{ title() }}</h1>
<v-card class="pa-8 mt-2">
<v-form ref="form" v-model="form_valid">
<v-autocomplete data-test="AccountsCU_Bank" :readonly="mode=='D'" :items="getArrayFromMap(useStore().banks).filter(v =>v.active==true)" v-model="new_account.banks" :label="$t('Select a bank')" item-title="name" item-value="url" :rules="RulesSelection(true)"></v-autocomplete>
<v-autocomplete data-test="AccountsCU_Bank" :readonly="mode=='D'" :items="getArrayFromMap(useStore().banks)" v-model="new_account.banks" :label="$t('Select a bank')" item-title="name" item-value="url" :rules="RulesSelection(true)"></v-autocomplete>
<v-text-field data-test="AccountsCU_Name" v-model="new_account.name" :readonly="mode=='D'" type="text" :label="$t('Account name')" :placeholder="$t('Account name')" autofocus :rules="RulesString(200,true)" counter="200"/>
<v-checkbox v-model="new_account.active" :readonly="mode=='D'" :label="$t('Is active?')" ></v-checkbox>
<v-text-field data-test="AccountsCU_Number" v-model="new_account.number" :readonly="mode=='D'" type="text" :label="$t('Account number')" :placeholder="$t('Account number')" :rules="RulesString(30,false)" counter="30"/>
<v-autocomplete :items="useStore().currencies" :readonly="mode=='D'" v-model="new_account.currency" :label="$t('Select a currency')" item-title="fullname" item-value="code" :rules="RulesSelection(true)"></v-autocomplete>
<v-text-field v-model.number="new_account.decimals" :readonly="mode=='D'" :label="$t('Account decimals')" :placeholder="$t('Account decimals')" autofocus :rules="RulesInteger(1,true)" counter="1"/>

</v-form>
<v-card-actions>
<v-spacer></v-spacer>
Expand Down Expand Up @@ -56,6 +55,13 @@
if (this.mode=="D") return this.$t("Delete")
},
acceptDialog(){
var bank=this.useStore().banks.get(this.new_account.banks)
if (bank.active==false){
alert(this.$t("You can't use an inactive bank"))
return
}


if (this.form_valid!=true) {
this.$refs.form.validate()
return
Expand Down
25 changes: 8 additions & 17 deletions src/components/BanksCU.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,17 @@
if (this.$refs.form.validate()==false) return
if (this.mode=='U'){
axios.put(this.new_bank.url, this.new_bank, this.myheaders())
.then(() => {
this.useStore().updateBanks()
.then(()=>{
this.$emit("cruded")

})
.then((response) => {
this.useStore().banks.set(response.data.url, response.data)
this.$emit("cruded")
}, (error) => {
this.parseResponseError(error)
})
} else if (this.mode=="C"){
axios.post(`${this.useStore().apiroot}/api/banks/`, this.new_bank, this.myheaders())
.then(() => {
this.useStore().updateBanks()
.then(()=>{
this.$emit("cruded")

})
.then((response) => {
this.useStore().banks.set(response.data.url, response.data)
this.$emit("cruded")
}, (error) => {
this.parseResponseError(error)
})
Expand All @@ -84,11 +78,8 @@
}
axios.delete(this.new_bank.url, this.myheaders())
.then(() => {
this.useStore().updateBanks()
.then(()=>{
this.$emit("cruded")

})
this.useStore().banks.delete(this.new_bank.url)
this.$emit("cruded")
}, (error) => {
this.parseResponseError(error)
});
Expand Down
4 changes: 3 additions & 1 deletion src/components/StrategyCU.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<v-card class="pa-8 mt-2">
<v-form ref="form" v-model="form_valid">
<v-text-field data-test="StrategyCU_Name" density="compact" :readonly="deleting" v-model="newstrategy.name" :label="$t('Set strategy name')" :placeholder="$t('Set strategy name')" :rules="RulesString(200,true)" counter="200" autofocus/>
<v-autocomplete data-test="StrategyCU_Investments" density="compact" :readonly="deleting" :items="getArrayFromMap(useStore().investments)" v-model="newstrategy.investments" :label="$t('Select strategy investments')" item-title="fullname" item-value="url" multiple :rules="RulesSelection(true)" chips></v-autocomplete>
<v-autocomplete data-test="StrategyCU_Investments" density="compact" :readonly="deleting" :items="getArrayFromMap(useStore().investments)" v-model="newstrategy.investments" :label="$t('Select strategy investments')" item-title="fullname" item-value="url" multiple chips />
<v-row class="d-flex flex-row mx-auto" justify="center">
<MyDateTimePicker class="mr-4" :readonly="deleting" v-model="newstrategy.dt_from" :label="$t('Date and time strategy start')" />
<MyDateTimePicker data-test="StrategyCU_DtTo" :readonly="deleting" v-model="newstrategy.dt_to" :label="$t('Date and time strategy end')" :clearable="true" />
Expand Down Expand Up @@ -42,6 +42,7 @@
import MyDateTimePicker from './MyDateTimePicker.vue'
import AutocompleteProducts from './AutocompleteProducts.vue'
import { RulesSelection, RulesInteger,RulesString } from 'vuetify_rules'
import { getArrayFromMap } from '@/functions'
export default {
components: {
MyDateTimePicker,
Expand Down Expand Up @@ -80,6 +81,7 @@
},
methods: {
useStore,
getArrayFromMap,
RulesSelection,
RulesInteger,
RulesString,
Expand Down
Loading