svalavuo 1 день назад
Родитель
Сommit
c89e9b7014

+ 12 - 0
frontend/src/components/accounting/ALVLaskentaSection.vue

@@ -26,6 +26,17 @@
           max="2030"
           class="year-input"
         >
+        <select 
+          v-model="selectedQuarter" 
+          v-if="selectedPeriod === 'quarter'"
+          @change="loadALVLaskenta"
+          class="quarter-input"
+        >
+          <option value="1">Q1 (Tammi-Maaliskuu)</option>
+          <option value="2">Q2 (Huhti-Kesäkuu)</option>
+          <option value="3">Q3 (Heinä-Syyskuu)</option>
+          <option value="4">Q4 (Loka-Joulukuu)</option>
+        </select>
         <button class="btn btn-primary" @click="exportToPDF">Export PDF</button>
         <button class="btn btn-secondary" @click="printReport">Tulosta</button>
       </div>
@@ -217,6 +228,7 @@ export default {
       selectedPeriod: 'year',
       selectedMonth: new Date().toISOString().slice(0, 7),
       selectedYear: 2024,
+      selectedQuarter: Math.ceil((new Date().getMonth() + 1) / 3),
       companyName: '',
       companyYtunnus: '',
       alvData: null,

+ 2 - 2
frontend/src/components/accounting/ExcelAccountingSection.vue

@@ -321,12 +321,12 @@ export default {
       return Math.ceil(this.filteredEntries.length / this.itemsPerPage)
     },
     totalIncome() {
-      return this.entries
+      return this.filteredEntries
         .filter(entry => entry.entry_type === 'Tulo')
         .reduce((sum, entry) => sum + parseFloat(entry.total_amount || 0), 0)
     },
     totalExpenses() {
-      return this.entries
+      return this.filteredEntries
         .filter(entry => entry.entry_type === 'Kulu')
         .reduce((sum, entry) => sum + parseFloat(entry.total_amount || 0), 0)
     },

+ 12 - 0
frontend/src/components/accounting/TuloslaskelmaSection.vue

@@ -26,6 +26,17 @@
           max="2030"
           class="year-input"
         >
+        <select 
+          v-model="selectedQuarter" 
+          v-if="selectedPeriod === 'quarter'"
+          @change="loadTuloslaskelma"
+          class="quarter-input"
+        >
+          <option value="1">Q1 (Tammi-Maaliskuu)</option>
+          <option value="2">Q2 (Huhti-Kesäkuu)</option>
+          <option value="3">Q3 (Heinä-Syyskuu)</option>
+          <option value="4">Q4 (Loka-Joulukuu)</option>
+        </select>
         <button class="btn btn-primary" @click="exportToPDF">Export PDF</button>
         <button class="btn btn-secondary" @click="printReport">Tulosta</button>
       </div>
@@ -336,6 +347,7 @@ export default {
       selectedPeriod: 'current',
       selectedMonth: new Date().toISOString().slice(0, 7),
       selectedYear: new Date().getFullYear(),
+      selectedQuarter: Math.ceil((new Date().getMonth() + 1) / 3),
       companyName: '',
       companyYtunnus: '',
       tuloslaskelmaData: null,