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

BUGFIXING #41

Merged
merged 4 commits into from
Jul 14, 2023
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
5 changes: 3 additions & 2 deletions src/helpers/commons/localeHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export function formatDateWithLocale(dateString?: string | number, format?: any,
}

export function formatNumberWithLocale(number: number, precision?: number, format?: any) {
return Intl.NumberFormat(getLocale(true), { ...format, minimumFractionDigits: precision || 2, maximumFractionDigits: precision || 2 }).format(number)
// return Intl.NumberFormat(getLocale(true), { ...format, minimumFractionDigits: precision || 2, maximumFractionDigits: precision || 2 }).format(number)
return Intl.NumberFormat(getLocale(true), { ...format, minimumFractionDigits: precision != null ? precision : 2, maximumFractionDigits: precision != null ? precision : 2 }).format(number)
}

export function luxonFormatDate(dateString: any | Date, inputFormat?: string, outputFormat?: string) {
Expand Down Expand Up @@ -68,4 +69,4 @@ export function getJSDateFromDateString(dateString: string, inputFormat: string)
export function getDateStringFromJSDate(date: Date, outputFormat: string) {
if (!date) return
return DateTime.fromJSDate(date).toFormat(outputFormat)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<InputText
id="name"
v-model="v$.document.name.$model"
:disabled="true"
class="kn-material-input"
type="text"
max-length="30"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
:python-environments="pythonEnvironments"
:r-environments="rEnvironments"
@fileUploaded="selectedDataset.fileUploaded = true"
@touched="$emit('touched')"
@queryEdited="showMetadataQueryInfo = true"
@touched="$emit('touched')"
/>
</TabPanel>

Expand Down Expand Up @@ -123,14 +123,6 @@ export default defineComponent({
availableTags: { type: Array as any, required: true },
datasetToCloneId: { type: Number as any }
},
computed: {
...mapState(mainStore, {
user: 'user'
}),
buttonDisabled(): any {
return this.v$.$invalid
}
},
emits: ['close', 'touched', 'loadingOlderVersion', 'olderVersionLoaded', 'updated', 'created', 'showSavingSpinner', 'hideSavingSpinner'],
data() {
return {
Expand All @@ -157,6 +149,15 @@ export default defineComponent({
showDataPreparation: false
}
},
computed: {
...mapState(mainStore, {
user: 'user'
}),
buttonDisabled(): any {
return this.v$.$invalid
}
},

watch: {
id() {
this.getAllDatasetData()
Expand Down Expand Up @@ -518,6 +519,7 @@ export default defineComponent({
} else {
this.previewDataset = this.selectedDataset
this.showPreviewDialog = true
console.log('PREVIEW DS', this.previewDataset)
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export default defineComponent({
},
created() {
this.deleteMultivalueDefault()
this.dataset = this.selectedDataset
},
updated() {
this.deleteMultivalueDefault()
Expand Down
Loading