Update meta files for new release.

frontend/src/components/accounts/Create.vue

@@ -97,7 +97,7 @@
 
               <GenericLocation :disabled="submitting" v-model="location" :title="$t('form.location')" :errors="errors.location"
                                v-on:set-field="storeField($event)"/>
-
+              <!-- attachments -->
               <GenericAttachments :disabled="submitting" :title="$t('form.attachments')" field-name="attachments" :errors="errors.attachments"
                                   v-on:selected-attachments="selectedAttachments($event)"
                                   v-on:selected-no-attachments="selectedNoAttachments($event)"
@@ -275,6 +275,8 @@ export default {
       this.hasAttachments = false;
     },
     uploadedAttachments: function (e) {
+      console.log('Response to event uploaded-attachments');
+      console.log(e);
       this.finishSubmission();
     },
     submitForm: function (e) {

frontend/src/components/accounts/Show.vue

@@ -23,6 +23,7 @@
     <div class="row">
       <div class="col-lg-12 col-md-6 col-sm-12 col-xs-12">
         <!-- Custom Tabs -->
+        <!--
         <div class="card">
           <div class="card-header d-flex p-0">
             <h3 class="card-title p-3">Tabs</h3>
@@ -31,36 +32,34 @@
               <li class="nav-item"><a class="nav-link" href="#budgets" data-toggle="tab">Budgets</a></li>
               <li class="nav-item"><a class="nav-link" href="#categories" data-toggle="tab">Categories</a></li>
             </ul>
-          </div><!-- /.card-header -->
+          </div>
           <div class="card-body">
             <div class="tab-content">
               <div class="tab-pane active" id="main_chart">
                 1: main chart
               </div>
-              <!-- /.tab-pane -->
               <div class="tab-pane" id="budgets">
                 2: tree map from/to budget
               </div>
-              <!-- /.tab-pane -->
               <div class="tab-pane" id="categories">
                 2: tree map from/to cat
               </div>
-              <!-- /.tab-pane -->
             </div>
-            <!-- /.tab-content -->
-          </div><!-- /.card-body -->
+          </div>
         </div>
-        <!-- ./card -->
+        -->
       </div>
     </div>
 
     <TransactionListLarge
         :entries="rawTransactions"
         :page="currentPage"
+        ref="list"
         :total="total"
         :per-page="perPage"
         :sort-desc="sortDesc"
         v-on:jump-page="jumpToPage($event)"
+        v-on:refreshed-cache-key="refreshedKey"
     />
     <div class="row">
       <div class="col-lg-12 col-md-6 col-sm-12 col-xs-12">
@@ -106,7 +105,7 @@ export default {
       perPage: 51,
       locale: 'en-US',
       api: null,
-      nameLoading:false
+      nameLoading: false
     }
   },
   created() {
@@ -132,16 +131,23 @@ export default {
               .then(response => {
                 let start = new Intl.DateTimeFormat(this.locale, {year: 'numeric', month: 'long', day: 'numeric'}).format(this.start);
                 let end = new Intl.DateTimeFormat(this.locale, {year: 'numeric', month: 'long', day: 'numeric'}).format(this.end);
-                document.getElementById('page-subTitle').innerText = this.$t('firefly.journals_in_period_for_account_js', {start: start, end: end, title: response.data.data.attributes.name});
+                document.getElementById('page-subTitle').innerText = this.$t('firefly.journals_in_period_for_account_js', {
+                  start: start,
+                  end: end,
+                  title: response.data.data.attributes.name
+                });
               });
         });
 
       }
     },
+    refreshedKey: function () {
+      this.loading = false;
+      this.getTransactions();
+      this.updatePageTitle();
+    },
     getTransactions: function () {
       if (this.showReady && !this.loading) {
-
-
         this.loading = true;
         configureAxios().then(async (api) => {
           // console.log('Now getTransactions() x Start');
@@ -149,8 +155,7 @@ export default {
           let endStr = format(this.end, 'y-MM-dd');
           this.rawTransactions = [];
 
-          let url = './api/v1/accounts/' + this.accountId + '/transactions?page=1&limit=' + this.perPage + '&start=' + startStr + '&end=' + endStr;
-
+          let url = './api/v1/accounts/' + this.accountId + '/transactions?page=1&limit=' + this.perPage + '&start=' + startStr + '&end=' + endStr + '&cache=' + this.cacheKey;
 
           api.get(url)
               .then(response => {

frontend/src/components/form/GenericAttachments.vue

@@ -97,22 +97,22 @@ export default {
         // });
 
         // new code
-        // console.log('start of new');
+        console.log('start of new');
         let files = this.$refs.att.files;
         this.uploads = files.length;
         // loop all files and create attachments.
         for (let i in files) {
           if (files.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
-            // console.log('Now at file ' + (parseInt(i) + 1) + ' / ' + files.length);
+            console.log('Now at file ' + (parseInt(i) + 1) + ' / ' + files.length);
             // read file into file reader:
             let current = files[i];
             let fileReader = new FileReader();
             let theParent = this; // dont ask me why i need to do this.
             fileReader.onloadend = evt => {
               if (evt.target.readyState === FileReader.DONE) {
-                // console.log('I am done reading file ' + (parseInt(i) + 1));
+                console.log('I am done reading file ' + (parseInt(i) + 1));
                 this.createAttachment(current.name).then(response => {
-                  // console.log('Created attachment. Now upload (1)');
+                  console.log('Created attachment. Now upload (1)');
                   return theParent.uploadAttachment(response.data.data.id, new Blob([evt.target.result]));
                 }).then(theParent.countAttachment);
               }
@@ -121,7 +121,7 @@ export default {
           }
         }
         if (0 === files.length) {
-          // console.log('No files to upload. Emit event!');
+          console.log('No files to upload. Emit event!');
           this.$emit('uploaded-attachments', this.transaction_journal_id);
         }
         // Promise.all(promises).then(response => {
@@ -138,15 +138,15 @@ export default {
   methods: {
     countAttachment: function () {
       this.uploaded++;
-      // console.log('Uploaded ' + this.uploaded + ' / ' + this.uploads);
+      console.log('Uploaded ' + this.uploaded + ' / ' + this.uploads);
       if (this.uploaded >= this.uploads) {
-        // console.log('All files uploaded. Emit event for ' + this.transaction_journal_id + '(' + this.index + ')');
-        this.$emit('uploaded-attachments', this.transaction_journal_id);
+        console.log('All files uploaded. Emit event for ' + this.uploadObjectId);
+        this.$emit('uploaded-attachments', this.uploadObjectId);
       }
     },
     uploadAttachment: function (attachmentId, data) {
       this.created++;
-      // console.log('Now in uploadAttachment()');
+      console.log('Now in uploadAttachment()');
       const uploadUri = './api/v1/attachments/' + attachmentId + '/upload';
       return axios.post(uploadUri, data)
     },

frontend/src/components/transactions/Index.vue

@@ -20,6 +20,7 @@
 
 <template>
   <div>
+    <!--
     <div class="row">
       <div class="col">
         <div class="card">
@@ -36,6 +37,7 @@
         </div>
       </div>
     </div>
+    -->
     <!-- page is ignored for the time being -->
     <TransactionListLarge
         :entries="rawTransactions"
@@ -44,7 +46,9 @@
         :per-page="perPage"
         :sort-desc="sortDesc"
         v-on:jump-page="jumpToPage($event)"
+        v-on:refreshed-cache-key="refreshedKey"
     />
+    <!--
     <div class="row">
       <div class="col-xl-2 col-lg-4 col-sm-6 col-xs-12" v-for="range in ranges">
         <div class="card">
@@ -56,7 +60,9 @@
           </div>
         </div>
       </div>
+
     </div>
+    -->
   </div>
 </template>
 
@@ -141,13 +147,12 @@ export default {
   },
   methods: {
     ...mapMutations('root', ['refreshCacheKey',]),
-    newCacheKey: function () {
-      this.refreshCacheKey();
+    refreshedKey: function () {
       this.downloaded = false;
-      this.accounts = [];
+      this.rawTransactions = [];
       this.getTransactionList();
     },
-    jumpToPage: function(event) {
+    jumpToPage: function (event) {
       // console.log('noticed a change!');
       this.currentPage = event.page;
       this.downloadTransactionList(event.page);

frontend/src/components/transactions/TransactionListLarge.vue

@@ -220,21 +220,26 @@ export default {
       this.$emit('jump-page', {page: value});
     },
     entries: function (value) {
+      console.log('detected new transactions!');
       this.parseTransactions();
     },
+    value: function(value) {
+      console.log('Watch value!');
+    }
   },
   methods: {
     ...mapMutations('root', ['refreshCacheKey',]),
     parseTransactions: function () {
+      this.transactions = [];
       // console.log('Start of parseTransactions. Count of entries is ' + this.entries.length + ' and page is ' + this.page);
       // console.log('Reported total is ' + this.total);
       if (0 === this.entries.length) {
-        // console.log('Will not render now');
+        console.log('Will not render now');
         return;
       }
-      // console.log('Now have ' + this.transactions.length + ' transactions');
+      console.log('Now have ' + this.transactions.length + ' transactions');
       for (let i = 0; i < this.total; i++) {
-        this.transactions.push({dummy: true});
+        this.transactions.push({dummy: true,type: 'x'});
         // console.log('Push dummy to index ' + i);
         // console.log('Now have ' + this.transactions.length + ' transactions');
       }
@@ -259,8 +264,9 @@ export default {
       this.loading = false;
     },
     newCacheKey: function () {
-      alert('TODO');
       this.refreshCacheKey();
+      console.log('Cache key is now ' + this.cacheKey);
+      this.$emit('refreshed-cache-key');
     },
     updateFieldList: function () {
       this.fields = [
@@ -314,6 +320,7 @@ export default {
           let info = transaction.attributes.transactions[i];
           let split = {};
           row.amount = row.amount + parseFloat(info.amount);
+          split.type = info.type;
           split.description = info.description;
           split.amount = info.amount;
           split.currency_code = info.currency_code;

frontend/src/locales/cs.json

@@ -70,7 +70,7 @@
         "daily_budgets": "Denn\u00ed rozpo\u010dty",
         "weekly_budgets": "T\u00fddenn\u00ed rozpo\u010dty",
         "monthly_budgets": "M\u011bs\u00ed\u010dn\u00ed rozpo\u010dty",
-        "journals_in_period_for_account_js": "All transactions for account {title} between {start} and {end}",
+        "journals_in_period_for_account_js": "Ve\u0161ker\u00e9 transakce pro \u00fa\u010det {title} mezi {start} a {end}",
         "quarterly_budgets": "\u010ctvrtletn\u00ed rozpo\u010dty",
         "create_new_expense": "Vytvo\u0159it v\u00fddajov\u00fd \u00fa\u010det",
         "create_new_revenue": "Vytvo\u0159it nov\u00fd p\u0159\u00edjmov\u00fd \u00fa\u010det",

frontend/src/locales/es.json

@@ -70,7 +70,7 @@
         "daily_budgets": "Presupuestos diarios",
         "weekly_budgets": "Presupuestos semanales",
         "monthly_budgets": "Presupuestos mensuales",
-        "journals_in_period_for_account_js": "All transactions for account {title} between {start} and {end}",
+        "journals_in_period_for_account_js": "Todas las transacciones de la cuenta {title} entre {start} y {end}",
         "quarterly_budgets": "Presupuestos trimestrales",
         "create_new_expense": "Crear nueva cuenta de gastos",
         "create_new_revenue": "Crear nueva cuenta de ingresos",
@@ -142,27 +142,27 @@
         "transaction_expand_split": "Expandir divisi\u00f3n",
         "transaction_collapse_split": "Colapsar divisi\u00f3n",
         "default_group_title_name": "(sin agrupaci\u00f3n)",
-        "bill_repeats_weekly": "Repeats weekly",
-        "bill_repeats_monthly": "Repeats monthly",
-        "bill_repeats_quarterly": "Repeats quarterly",
-        "bill_repeats_half-year": "Repeats every half year",
-        "bill_repeats_yearly": "Repeats yearly",
-        "bill_repeats_weekly_other": "Repeats every other week",
-        "bill_repeats_monthly_other": "Repeats every other month",
-        "bill_repeats_quarterly_other": "Repeats every other quarter",
-        "bill_repeats_half-year_other": "Repeats yearly",
-        "bill_repeats_yearly_other": "Repeats every other year",
-        "bill_repeats_weekly_skip": "Repeats every {skip} weeks",
-        "bill_repeats_monthly_skip": "Repeats every {skip} months",
-        "bill_repeats_quarterly_skip": "Repeats every {skip} quarters",
-        "bill_repeats_half-year_skip": "Repeats every {skip} half years",
-        "bill_repeats_yearly_skip": "Repeats every {skip} years",
+        "bill_repeats_weekly": "Repetir semanalmente",
+        "bill_repeats_monthly": "Repetir mensualmente",
+        "bill_repeats_quarterly": "Repite trimestralmente",
+        "bill_repeats_half-year": "Repetir cada 6 meses",
+        "bill_repeats_yearly": "Repetir anualmente",
+        "bill_repeats_weekly_other": "Repetir cada dos semanas",
+        "bill_repeats_monthly_other": "Repetir cada dos meses",
+        "bill_repeats_quarterly_other": "Repetir cada dos trimestres",
+        "bill_repeats_half-year_other": "Repetir anualmente",
+        "bill_repeats_yearly_other": "Repetir cada dos a\u00f1os",
+        "bill_repeats_weekly_skip": "Repetir cada {skip} semanas",
+        "bill_repeats_monthly_skip": "Repetir cada {skip} meses",
+        "bill_repeats_quarterly_skip": "Repetir cada {skip} trimestres",
+        "bill_repeats_half-year_skip": "Repetir cada {skip} medios a\u00f1os",
+        "bill_repeats_yearly_skip": "Repetir cada {skip} a\u00f1os",
         "not_expected_period": "No se espera en este per\u00edodo",
-        "subscriptions": "Subscriptions",
+        "subscriptions": "Suscripciones",
         "bill_expected_date_js": "Expected {date}",
         "inactive": "Inactivo",
-        "forever": "Forever",
-        "extension_date_is": "Extension date is {date}",
+        "forever": "Siempre",
+        "extension_date_is": "Fecha de extensi\u00f3n es {date}",
         "create_new_bill": "Crear nueva factura",
         "store_new_bill": "Crear factura",
         "repeat_freq_yearly": "anualmente",
@@ -170,13 +170,13 @@
         "repeat_freq_quarterly": "trimestralmente",
         "repeat_freq_monthly": "mensualmente",
         "repeat_freq_weekly": "semanalmente",
-        "credit_card_type_monthlyFull": "Full payment every month",
+        "credit_card_type_monthlyFull": "Pago completo cada mes",
         "update_liabilities_account": "Actualizar pasivo",
         "update_expense_account": "Actualizar cuenta de gastos",
         "update_revenue_account": "Actualizar cuenta de ingresos",
-        "update_undefined_account": "Update account",
+        "update_undefined_account": "Actualizar cuenta",
         "update_asset_account": "Actualizar cuenta de activos",
-        "updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
+        "updated_account_js": "Cuenta actualizada \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
     },
     "list": {
         "piggy_bank": "Alcancilla",
@@ -197,10 +197,10 @@
         "liability_direction": "Pasivo entrada\/salida",
         "currentBalance": "Balance actual",
         "next_expected_match": "Pr\u00f3xima coincidencia esperada",
-        "expected_info": "Next expected transaction",
-        "start_date": "Start date",
-        "end_date": "End date",
-        "payment_info": "Payment information"
+        "expected_info": "Siguiente transacci\u00f3n esperada",
+        "start_date": "Fecha de inicio",
+        "end_date": "Fecha fin",
+        "payment_info": "Informaci\u00f3n del pago"
     },
     "config": {
         "html_language": "es",
@@ -221,7 +221,7 @@
         "repeat_freq": "Repetici\u00f3n",
         "skip": "Saltar",
         "startdate": "Fecha de inicio",
-        "enddate": "End date",
+        "enddate": "Fecha fin",
         "object_group": "Grupo",
         "attachments": "Adjuntos",
         "active": "Activo",
@@ -252,6 +252,6 @@
         "amount_max": "Importe m\u00e1ximo",
         "start_date": "Inicio del rango",
         "end_date": "Final del rango",
-        "extension_date": "Extension date"
+        "extension_date": "Fecha de extensi\u00f3n"
     }
 }

frontend/src/locales/sv.json

@@ -70,7 +70,7 @@
         "daily_budgets": "Dagliga budgetar",
         "weekly_budgets": "Veckovis budgetar",
         "monthly_budgets": "M\u00e5natliga budgetar",
-        "journals_in_period_for_account_js": "All transactions for account {title} between {start} and {end}",
+        "journals_in_period_for_account_js": "Alla transaktioner f\u00f6r konto {title} mellan {start} och {end}",
         "quarterly_budgets": "Kvartalsbudgetar",
         "create_new_expense": "Skapa ett nytt utgiftskonto",
         "create_new_revenue": "Skapa ett nytt int\u00e4ktskonto",
@@ -174,9 +174,9 @@
         "update_liabilities_account": "Uppdatera skuld",
         "update_expense_account": "Uppdatera utgiftskonto",
         "update_revenue_account": "Uppdatera int\u00e4ktskonto",
-        "update_undefined_account": "Update account",
+        "update_undefined_account": "Uppdatera konto",
         "update_asset_account": "Uppdatera tillg\u00e5ngskonto",
-        "updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
+        "updated_account_js": "Uppdaterade kontot \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
     },
     "list": {
         "piggy_bank": "Spargris",