refactor(Expense Claim Summary): get fiscal years from Accounting api

Author: vinyselopal

frontend/src/components/ExpenseClaimSummary.vue

@@ -23,11 +23,11 @@
 					</div>
 					<span class="text-gray-800 text-base font-semibold leading-6">
 						{{
-							formatCurrency(
-								summary.data?.total_pending_amount,
-								company_currency
-							)
-						}}
+		formatCurrency(
+			summary.data?.total_pending_amount,
+			company_currency
+		)
+	}}
 					</span>
 				</div>
 				<div class="flex flex-col gap-1">
@@ -39,11 +39,11 @@
 					</div>
 					<span class="text-gray-800 text-base font-semibold leading-6">
 						{{
-							formatCurrency(
-								summary.data?.total_approved_amount,
-								company_currency
-							)
-						}}
+			formatCurrency(
+				summary.data?.total_approved_amount,
+				company_currency
+			)
+		}}
 					</span>
 				</div>
 
@@ -56,11 +56,11 @@
 					</div>
 					<span class="text-gray-800 text-base font-semibold leading-6">
 						{{
-							formatCurrency(
-								summary.data?.total_rejected_amount,
-								company_currency
-							)
-						}}
+			formatCurrency(
+				summary.data?.total_rejected_amount,
+				company_currency
+			)
+		}}
 					</span>
 				</div>
 			</div>
@@ -70,7 +70,7 @@
 					label="Select Fiscal Year"
 					class="w-full"
 					placeholder="Select Fiscal Year"
-					:options="fiscalYears.data"
+					:options="fiscalYears.data.fiscal_years"
 					v-model="selectedPeriod"
 				/>
 			</div>
@@ -88,17 +88,6 @@ const dayjs = inject("$dayjs")
 
 let selectedPeriod = ref({})
 
-const initializeSelectedPeriod = () => {
-	const today = dayjs().format("YYYY-MM-DD")
-
-	const currentPeriod = fiscalYears.data.find(
-		(period) => today >= period.year_start_date && today <= period.year_end_date
-	)
-	selectedPeriod.value = (currentPeriod && currentPeriod.value) || fiscalYears.data[0].value
-}
-
-initializeSelectedPeriod()
-
 const total_claimed_amount = computed(() => {
 	return (
 		summary.data?.total_pending_amount +
@@ -108,23 +97,23 @@ const total_claimed_amount = computed(() => {
 })
 
 const fetchExpenseClaimSummary = (selectedPeriod) => {
-	const year_start_date = fiscalYears.data
-		? fiscalYears.data.find((period) => period.value === selectedPeriod).year_start_date
-		: ""
-	const year_end_date = fiscalYears.data
-		? fiscalYears.data.find((period) => period.value === selectedPeriod).year_end_date
-		: ""
+	const year_start_date = selectedPeriod && selectedPeriod.year_start_date
+	const year_end_date = selectedPeriod && selectedPeriod.year_end_date
 	summary.reload({ year_start_date, year_end_date })
 }
 
 watch(
 	() => selectedPeriod.value,
-	(newValue) => fetchExpenseClaimSummary(newValue.value)
+	(newValue) => {
+		return fetchExpenseClaimSummary(newValue)
+	},
+	{ deep: true }
 )
 
 const company_currency = computed(() => summary.data?.currency)
 
 onMounted(() => {
+	selectedPeriod.value = fiscalYears.data.current_fiscal_year
 	fetchExpenseClaimSummary(selectedPeriod.value)
 })
 </script>

frontend/src/data/claims.js

@@ -21,18 +21,30 @@ function getPeriodLabel(period) {
 	).format("MMM YYYY")}`
 }
 
+const add_options = (period) => {
+	return {
+		...period,
+		value: getPeriodLabel(period),
+		label: getPeriodLabel(period),
+	}
+}
+
 export const fiscalYears = createResource({
 	url: "hrms.api.get_fiscal_years_for_company",
 	params: {
 		company: employeeResource.data?.company,
+		current_date: dayjs().format("YYYY-MM-DD"),
 	},
 	auto: true,
 	transform: (data) => {
-		return data.map((period) => {
-			; (period.value = getPeriodLabel(period)), (period.label = getPeriodLabel(period))
-			return period
-		})
-	}
+		const newdata = {
+			current_fiscal_year: add_options(data.current_fiscal_year),
+			fiscal_years: data.fiscal_years.map((period) => {
+				return add_options(period)
+			}),
+		}
+		return newdata
+	},
 })
 
 const transformClaimData = (data) => {

hrms/api/__init__.py

@@ -5,6 +5,8 @@
 from frappe.utils import getdate
 from frappe.utils.data import cint
 
+from erpnext.accounts.utils import get_fiscal_year, get_fiscal_years
+
 SUPPORTED_FIELD_TYPES = [
 	"Link",
 	"Select",
@@ -645,19 +647,7 @@ def is_employee_checkin_allowed():
 
 @frappe.whitelist()
 def get_fiscal_years_for_company(company):
-	periods = frappe.db.sql(
-		f"""
-			SELECT FY.year_start_date as year_start_date, FY.year_end_date as year_end_date, FY.year as year
-			FROM `tabFiscal Year` as FY
-			INNER JOIN `tabFiscal Year Company` as FYC
-			ON FY.name = FYC.parent
-			WHERE FYC.company = '{company}'
-			ORDER BY FY.year;
-		"""
-	)
-
-	def get_period_obj(period):
-		return {"year_start_date": period[0], "year_end_date": period[1], "year": period[2]}
-
-	fiscal_years = [get_period_obj(period) for period in periods]
-	return fiscal_years
+	today = getdate()
+	fiscal_years = get_fiscal_years(company=company, as_dict=True)
+	current_fiscal_year = get_fiscal_year(company=company, date=today, as_dict=True)
+	return {"fiscal_years": fiscal_years, "current_fiscal_year": current_fiscal_year}