diff --git a/CHANGELOG.md b/CHANGELOG.md index 778d04638..119f702f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,100 @@ +# Version 24.24 - 2024-06-11 + +### Added 🆕 + +- feat: 6942 hashtag in key : value summary by:jgallego +- feat: #6957: Rename FetchedTags instance tag by:Javier Segarra +- feat: refactor template by:Javier Segarra +- feat: refs #6600 Add option to add comment for photo motivation by:jorgep +- feat: refs #6942 test e2e tobook & toUnbook by:jorgep +- feat: refs #6942 to book summary button & reactive value by:jorgep +- feat: refs #6942 to unbook by:jorgep +- feat: refs #6942 url update by:jorgep +- feat: refs #6942 use correct currency in InvoiceIn components by:jorgep +- feat: refs #6942 vat rate total by:jorgep +- feat: refs #7494 new icons (7494-icons) by:alexm +- feat: refs #7494 new icons by:alexm +- feat: refs #7542 drop space by:jorgep +- feat: refs #7542 empty by:jorgep +- fix: refs #6942 changes and new features by:jorgep +- fix: style by:Javier Segarra +- style: color transparent when is fetive by:Javier Segarra +- style: fix color when is empty by:Javier Segarra +- style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra +- style: reset poc style by:Javier Segarra +- style updates by:Javier Segarra + +### Changed 📦 + +- feat: refactor template by:Javier Segarra +- perf: 6957 add color as new shared variable by:Javier Segarra +- perf: 6957 change fetchedTags color by:Javier Segarra +- perf: remove local tree variable by:Javier Segarra +- refactor: add flat by:alexm +- refactor: refs #6600 replace QInput to VnInput by:jorgep +- refactor: refs #6652 improved defaulter section by:Jon +- refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep +- refactor: refs #6942 new summary layout by:jorgep +- refactor: refs #6942 store key & actions by:jorgep +- refactor: refs #6942 summary by:jorgep +- refactor: refs #6942 use router hook by:jorgep +- refactor: refs #6942 WIP summary layout by:jorgep + +### Fixed 🛠️ + +- fix: 9-12 by:Javier Segarra +- fix: defaulter icon by:alexm +- fix: refs #5186 validation by:jorgep +- fix: refs #6095 add reFfk null on search by:pablone +- fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep +- fix: refs #6942 changes and new features by:jorgep +- fix: refs #6942 drop comments by:jorgep +- fix: refs #6942 drop console by:jorgep +- fix: refs #6942 drop console.log by:jorgep +- fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep +- fix: refs #6942 e2e tests by:jorgep +- fix: refs #6942 e2e tests by:jorgep +- fix: refs #6942 fix emit on data saved by:jorgep +- fix: refs #6942 fix emit on reset by:jorgep +- fix: refs #6942 fix vncard by:jorgep +- fix: refs #6942 formModel & CardDescriptor by:jorgep +- fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep +- fix: refs #6942 import by:jorgep +- fix: refs #6942 reloading by:jorgep +- fix: refs #6942 rollback by:jorgep +- fix: refs #6942 selectable expense by:jorgep +- fix: refs #6942 skip e2e tests by:jorgep +- fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep +- fix: refs #6942 tests e2e by:jorgep +- fix: refs #6942 tests & summary table spacing by:jorgep +- fix: refs #6942 unit tests by:jorgep +- fix: refs #6942 vnLocation by:jorgep +- fix: refs #6942 wip: formModel by:jorgep +- fix: refs #7542 use right panel by:jorgep +- fix: searchbar redirect by:alexm +- fix: style by:Javier Segarra +- fix: WorkerCalendarItem by:Javier Segarra +- mini fix by:wbuezas +- refs #6111 clean code fix changes by:carlossa +- refs #6111 fix merge, fix column by:carlossa +- refs #6111 fix qtable, actions, scroll by:carlossa +- refs #6111 fix routeList by:carlossa +- refs #6111 fix sticky by:carlossa +- refs #6111 fix trad remove logs by:carlossa +- refs #6111 fix visibleColumns by:carlossa +- refs #6111 routeList fix by:carlossa +- refs #6332 fix calendar by:carlossa +- refs #6332 fix colors by:carlossa +- refs #6332 fix festive by:carlossa +- refs #6820 fix BasicData Tickets by:carlossa +- refs #6820 fix error front by:carlossa +- refs #6820 fix traduction by:carlossa +- refs #7391 fix textarea by:carlossa +- refs #7396 fix summary by:carlossa +- Search childs fix by:wbuezas +- small fix by:wbuezas +- style: fix color when is empty by:Javier Segarra + # Changelog All notable changes to this project will be documented in this file. diff --git a/Jenkinsfile b/Jenkinsfile index 7cad5ef41..1766e3aea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { sh 'quasar build' script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } dockerBuild() } @@ -106,7 +106,7 @@ pipeline { steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } withKubeConfig([ serverUrl: "$KUBERNETES_API", diff --git a/changelog.sh b/changelog.sh new file mode 100644 index 000000000..8cd7b4716 --- /dev/null +++ b/changelog.sh @@ -0,0 +1,34 @@ +features_types=(chore feat style) +changes_types=(refactor perf) +fix_types=(fix revert) +file="CHANGELOG.md" +file_tmp="temp_log.txt" +file_current_tmp="temp_current_log.txt" + +setType(){ + echo "### $1" >> $file_tmp + arr=("$@") + echo "" > $file_current_tmp + for i in "${arr[@]}" + do + git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp + done + # remove duplicates + sort -o $file_current_tmp -u $file_current_tmp + cat $file_current_tmp >> $file_tmp + echo "" >> $file_tmp + # remove tmp current file + [ -e $file_current_tmp ] && rm $file_current_tmp +} + +echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp +echo "" >> $file_tmp + +setType "Added 🆕" "${features_types[@]}" +setType "Changed 📦" "${changes_types[@]}" +setType "Fixed 🛠️" "${fix_types[@]}" + +cat $file >> $file_tmp +mv $file_tmp $file + + diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 377708143..426d99b9a 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue'; import VnConfirm from './ui/VnConfirm.vue'; import { tMobile } from 'src/composables/tMobile'; import { useArrayData } from 'src/composables/useArrayData'; +import { useRoute } from 'vue-router'; const { push } = useRouter(); const quasar = useQuasar(); @@ -20,6 +21,7 @@ const stateStore = useStateStore(); const { t } = useI18n(); const { validate } = useValidator(); const { notify } = useNotify(); +const route = useRoute(); const $props = defineProps({ url: { @@ -28,7 +30,7 @@ const $props = defineProps({ }, model: { type: String, - default: '', + default: null, }, filter: { type: Object, @@ -82,17 +84,18 @@ const $props = defineProps({ description: 'It is used for redirect on click "save and continue"', }, }); - const emit = defineEmits(['onFetch', 'onDataSaved']); - +const modelValue = computed( + () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}` +); const componentIsRendered = ref(false); -const arrayData = useArrayData($props.model); +const arrayData = useArrayData(modelValue); const isLoading = ref(false); // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas const isResetting = ref(false); const hasChanges = ref(!$props.observeFormChanges); const originalData = ref({}); -const formData = computed(() => state.get($props.model)); +const formData = computed(() => state.get(modelValue)); const formUrl = computed(() => $props.url); const defaultButtons = computed(() => ({ save: { @@ -114,7 +117,7 @@ onMounted(async () => { nextTick(() => (componentIsRendered.value = true)); // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla - state.set($props.model, $props.formInitialData); + state.set(modelValue, $props.formInitialData); if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch(); else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data); @@ -161,8 +164,8 @@ onBeforeRouteLeave((to, from, next) => { onUnmounted(() => { // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas. - if (hasChanges.value) return state.set($props.model, originalData.value); - if ($props.clearStoreOnUnmount) state.unset($props.model); + if (hasChanges.value) return state.set(modelValue, originalData.value); + if ($props.clearStoreOnUnmount) state.unset(modelValue); }); async function fetch() { @@ -174,7 +177,7 @@ async function fetch() { updateAndEmit('onFetch', data); } catch (e) { - state.set($props.model, {}); + state.set(modelValue, {}); originalData.value = {}; } } @@ -235,11 +238,11 @@ function filter(value, update, filterOptions) { } function updateAndEmit(evt, val, res) { - state.set($props.model, val); + state.set(modelValue, val); originalData.value = val && JSON.parse(JSON.stringify(val)); if (!$props.url) arrayData.store.data = val; - emit(evt, state.get($props.model), res); + emit(evt, state.get(modelValue), res); } defineExpose({ save, isLoading, hasChanges }); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9e382468f..5ef3a5472 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -396,6 +396,7 @@ entry: type: Type color: Color id: ID + printedStickers: Printed stickers notes: observationType: Observation type descriptor: @@ -582,6 +583,9 @@ claim: created: Created state: State pickup: Pick up + null: No + agency: Agency + delivery: Delivery photo: fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}' noData: 'There are no images/videos, click here or drag and drop the file' diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f95d3bff7..cfadd57b3 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -394,6 +394,7 @@ entry: type: Tipo color: Color id: ID + printedStickers: Etiquetas impresas notes: observationType: Tipo de observación descriptor: diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue index a378266aa..b08c40810 100644 --- a/src/pages/Entry/Card/EntryBuys.vue +++ b/src/pages/Entry/Card/EntryBuys.vue @@ -82,6 +82,16 @@ const tableColumnComponents = computed(() => ({ }, event: getInputEvents, }, + printedStickers: { + component: VnInput, + props: { + type: 'number', + min: 0, + class: 'input-number', + dense: true, + }, + event: getInputEvents, + }, weight: { component: VnInput, props: { @@ -147,7 +157,7 @@ const entriesTableColumns = computed(() => { return [ { label: t('entry.summary.item'), - field: 'id', + field: 'itemFk', name: 'item', align: 'left', }, @@ -169,6 +179,12 @@ const entriesTableColumns = computed(() => { name: 'stickers', align: 'left', }, + { + label: t('entry.buys.printedStickers'), + field: 'printedStickers', + name: 'printedStickers', + align: 'left', + }, { label: t('entry.summary.weight'), field: 'weight', @@ -216,7 +232,6 @@ const entriesTableColumns = computed(() => { }); const copyOriginalRowsData = (rows) => { - // el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos originalRowDataCopy.value = JSON.parse(JSON.stringify(rows)); }; @@ -386,19 +401,16 @@ const lockIconType = (groupingMode, mode) => { - + - + {{ props.row.item.itemType.code }} - - {{ props.row.item.id }} - {{ props.row.item.size }} @@ -413,10 +425,6 @@ const lockIconType = (groupingMode, mode) => { - - - -