diff --git a/.gitignore b/.gitignore index 7b004e5..b3d7101 100644 --- a/.gitignore +++ b/.gitignore @@ -191,4 +191,5 @@ cython_debug/ # exclude from AI features like autocomplete and code analysis. Recommended for sensitive data # refer to https://docs.cursor.com/context/ignore-files .cursorignore -.cursorindexingignore \ No newline at end of file +.cursorindexingignore +V25.1/.DS_Store diff --git a/V25.1/Bill/BillIncrElec.sql b/V25.1/Bill/BillIncrElec.sql new file mode 100644 index 0000000..9f12add --- /dev/null +++ b/V25.1/Bill/BillIncrElec.sql @@ -0,0 +1,28 @@ +-- BillIncrElec +-- 20250703 + +SUM( + CASE + WHEN NOT ISNULL(ft.FuelType,0) = '0' + AND (kWh1 * (ISNULL(RateE1, 0) + ISNULL(RateEFrac1,0)) + kWh2 * (ISNULL(RateEFrac2_1,0)+ISNULL(RateE2,0)+ISNULL(RateEFrac2_2,0))) < 0 + THEN ISNULL( + Qty * + IR * + RR * + ( NTGRkWh + @MEBens ) * + ( + kWh1 * + ( + ISNULL( RateE1, 0 ) + + ISNULL( RateEFrac1, 0 ) + ) + + kWh2 * + ( + ISNULL( RateEFrac2_1, 0 ) + + ISNULL( RateE2, 0 ) + + ISNULL( RateEFrac2_2, 0 ) + ) + ), 0 + ) + ELSE 0 + END) \ No newline at end of file diff --git a/V25.1/Bill/BillIncrGas.sql b/V25.1/Bill/BillIncrGas.sql new file mode 100644 index 0000000..e5299b5 --- /dev/null +++ b/V25.1/Bill/BillIncrGas.sql @@ -0,0 +1,29 @@ +-- BillIncrGas +-- 20250705 + +SUM( + CASE + WHEN NOT ISNULL(ft.FuelType,0) = '0' + AND (Thm1 * (ISNULL(RateG1, 0) + ISNULL(RateGFrac1,0)) + Thm2 * (ISNULL(RateGFrac2_1,0)+ISNULL(RateG2,0)+ISNULL(RateGFrac2_2,0))) < 0 + THEN + ISNULL( + Qty * + IR * + RR * + ( NTGRThm + @MEBens ) * + ( + Thm1 * + ( + ISNULL( RateG1, 0 ) + + ISNULL( RateGFrac1, 0 ) + ) + + Thm2 * + ( + ISNULL( RateGFrac2_1, 0 ) + + ISNULL( RateG2, 0 ) + + ISNULL( RateGFrac2_2, 0 ) + ) + ), 0 + ) + ELSE 0 + END) \ No newline at end of file diff --git a/V25.1/Bill/BillReducElec.sql b/V25.1/Bill/BillReducElec.sql new file mode 100644 index 0000000..5f87137 --- /dev/null +++ b/V25.1/Bill/BillReducElec.sql @@ -0,0 +1,28 @@ +-- BillReducElec +-- 20250703 + +SUM( + CASE + WHEN NOT ISNULL(ft.FuelType,0) = '0' + OR (kWh1 * (ISNULL(RateE1, 0) + ISNULL(RateEFrac1,0)) + kWh2 * (ISNULL(RateEFrac2_1,0)+ISNULL(RateE2,0)+ISNULL(RateEFrac2_2,0))) > 0 + THEN ISNULL( + Qty * + IR * + RR * + ( NTGRkWh + @MEBens ) * + ( + kWh1 * + ( + ISNULL( RateE1, 0 ) + + ISNULL( RateEFrac1, 0 ) + ) + + kWh2 * + ( + ISNULL( RateEFrac2_1, 0 ) + + ISNULL( RateE2, 0 ) + + ISNULL( RateEFrac2_2, 0 ) + ) + ), 0 + ) + ELSE 0 + END) \ No newline at end of file diff --git a/V25.1/BillReduction/BillReducGas.sql b/V25.1/Bill/BillReducGas.sql similarity index 59% rename from V25.1/BillReduction/BillReducGas.sql rename to V25.1/Bill/BillReducGas.sql index d1b1641..cac626f 100644 --- a/V25.1/BillReduction/BillReducGas.sql +++ b/V25.1/Bill/BillReducGas.sql @@ -1,11 +1,13 @@ --- BillReducGas 20250703 +-- BillReducGas +-- 20250705 SUM( CASE - WHEN NOT ISNULL(ft.FuelType,0) = '0' AND (Thm1 (ISNULL(RateG1, 0) + ISNULL(RateGFrac1,0)) + Thm2 (ISNULL(RateGFrac2_1,0)+ISNULL(RateG2,0)+ISNULL(RateGFrac2_2,0)))<0 + WHEN NOT ISNULL(ft.FuelType,0) = '0' + OR (Thm1 (ISNULL(RateG1, 0) + ISNULL(RateGFrac1,0)) + Thm2 (ISNULL(RateGFrac2_1,0)+ISNULL(RateG2,0)+ISNULL(RateGFrac2_2,0))) > 0 THEN ISNULL( - -Qty * + Qty * IR * RR * ( NTGRThm + @MEBens ) *