diff --git a/.gitignore b/.gitignore index 8d4f890..bccaf02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .vs/* budget.sqlproj +Load BUDGET_DETAIL.sql +budget queries.sql diff --git a/holidays.sql b/holidays.sql new file mode 100644 index 0000000..ee3cc20 Binary files /dev/null and b/holidays.sql differ diff --git a/procedures/proc_GetTransactions.sql b/procedures/proc_GetTransactions.sql index 59d512f..6e32298 100644 --- a/procedures/proc_GetTransactions.sql +++ b/procedures/proc_GetTransactions.sql @@ -9,7 +9,7 @@ begin set @yr = isnull(@yr, year(getdate())) set @mo = isnull(@mo, month(getdate())) - select Id, TrxDate, TrxDate_ISO8601, TrxDescription, TrxAmount, RunningBal + select TrxId, TrxDate, TrxDate_ISO8601, TrxDescription, TrxAmount, RunningBal from dbo.vw_BudgetRunningBalance where YEAR(TrxDate) = @yr diff --git a/views/vw_BudgetRunningBalance.sql b/views/vw_BudgetRunningBalance.sql index 1d3ed71..ccebe68 100644 --- a/views/vw_BudgetRunningBalance.sql +++ b/views/vw_BudgetRunningBalance.sql @@ -1,9 +1,9 @@ use Leo go -create view dbo.vw_BUDGET_RUNNING_BAL -as -select - BDT_DATE, BDT_DESCRIPTION, BDT_AMOUNT - , sum(BDT_AMOUNT) over(order by BDT_DATE, BDT_AMOUNT desc rows unbounded preceding) RUNNING_BAL +alter view dbo.vw_BudgetRunningBalance +as +select + TrxId, TrxDate, TrxDate_ISO8601=convert(datetime, TrxDate, 126), TrxDescription, TrxAmount + , sum(TrxAmount) over(order by TrxDate, TrxAmount desc rows unbounded preceding) RunningBal from dbo.BUDGET_DETAIL \ No newline at end of file diff --git a/views/vw_CurrentMonthBudget.sql b/views/vw_CurrentMonthBudget.sql index 1e404f7..ebcc304 100644 --- a/views/vw_CurrentMonthBudget.sql +++ b/views/vw_CurrentMonthBudget.sql @@ -1,8 +1,8 @@ use Leo go -create view dbo.vw_CURR_MONTH_BUDGET +alter view dbo.vw_CurrentMonthBudget as -select * -from dbo.vw_BUDGET_RUNNING_BAL -where BDT_DATE between dateadd(DAY, 1, EOMONTH(getDate(), -1)) and eomonth(getDate()) \ No newline at end of file +select * +from dbo.vw_BudgetRunningBalance +where TrxDate between dateadd(DAY, 1, EOMONTH(getDate(), -1)) and eomonth(getDate()) \ No newline at end of file