aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2151 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldreleases/1.4
Dave Peticolas 26 years ago
parent 5a9e1135d0
commit 757e78d06d
6 changed files with 260 additions and 106 deletions
Show Stats Download Patch File Download Diff File

77
src/SplitLedger.c
Unescape View File

@ -328,18 +328,17 @@ gnc_copy_trans(Transaction *from, Transaction *to)
* This callback is centrally involved in the redraw sequence.
* When the user moves from one cell to another, the following
* sequence of events get triggered and cascade down:
* enterCB () {
* VerifyCursorPosition() {
* MoveCursor() {
* callback for move() which is this function (LedgerMoveCursor) {
* SaveRegEntry() {...}
* RedrawRegEntry() {
* SRLoadRegister() {
* SRLoadRegEntry() {
* MoveCursor () { }
* }
* }
* } }}}}
* VerifyCursorPosition() {
* MoveCursor() {
* callback for move() which is this function (LedgerMoveCursor) {
* SaveRegEntry() {...}
* RedrawRegEntry() {
* SRLoadRegister() {
* SRLoadRegEntry() {
* MoveCursor () { }
* }
* }
* }}}}
*/
static void
@ -457,7 +456,6 @@ LedgerMoveCursor (Table *table,
new_phys_row, new_phys_col);
reg->cursor_phys_row = new_phys_row;
reg->cursor_phys_col = new_phys_col;
locator = table->locators[new_phys_row][new_phys_col];
reg->cursor_virt_row = locator->virt_row;
@ -471,10 +469,8 @@ LedgerMoveCursor (Table *table,
if ((REG_SINGLE_DYNAMIC == style) ||
(REG_DOUBLE_DYNAMIC == style))
{
Split *split;
split = xaccGetUserData (reg->table, new_phys_row, new_phys_col);
reg->table->current_cursor->user_data = (void *) split;
new_split = xaccGetUserData (reg->table, new_phys_row, new_phys_col);
reg->table->current_cursor->user_data = (void *) new_split;
xaccRegisterRefresh (reg);
@ -664,7 +660,7 @@ xaccSRGetCurrentTrans (SplitRegister *reg)
/* Split is blank. Assume it is the blank split of a multi-line
* transaction. Go back one row to find a split in the transaction. */
pr = reg->cursor_phys_row;
pr = reg->table->current_cursor_phys_row;
pc = reg->table->current_cursor_phys_col;
vr = reg->table->locators[pr][pc]->virt_row;
vc = reg->table->locators[pr][pc]->virt_col;
@ -1121,8 +1117,8 @@ xaccSRCancelCursorSplitChanges (SplitRegister *reg)
{
Split * split;
unsigned int changed;
int row = reg->cursor_phys_row;
int col = reg->cursor_phys_col;
int row = reg->table->current_cursor_phys_row;
int col = reg->table->current_cursor_phys_col;
changed = xaccSplitRegisterGetChangeFlag(reg);
if (!changed)
@ -1188,7 +1184,7 @@ xaccSRCancelCursorTransChanges (SplitRegister *reg)
affected_accounts[i+num_splits] = xaccSplitGetAccount (split);
}
affected_accounts[num_splits+more_splits] = NULL;
xaccAccListDisplayRefresh (affected_accounts);
free (affected_accounts);
@ -1817,7 +1813,7 @@ xaccSRLoadTransEntry (SplitRegister *reg, Split *split, int do_commit)
xaccCommitCursor (reg->table);
}
LEAVE("SRLoadTransEntry():\n");
LEAVE("SRLoadTransEntry()\n");
}
/* ======================================================== */
@ -1840,6 +1836,8 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
Transaction *save_current_trans = NULL;
int save_cursor_phys_row;
int save_cursor_virt_row;
int save_cell_row;
Locator *locator;
Table *table;
int num_phys_rows;
int num_virt_rows;
@ -1867,9 +1865,16 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
save_cursor_phys_row = reg->cursor_phys_row;
save_cursor_virt_row = reg->cursor_virt_row;
/* save the current cell row offset */
locator = table->locators[reg->table->current_cursor_phys_row]
[reg->table->current_cursor_phys_col];
save_cell_row = locator->phys_row_offset;
if (save_cell_row < 0)
save_cell_row = 0;
/* num_phys_rows is the number of rows in all the cursors.
* num_virt_rows is the number of cursors (including the header).
* Count the number of rows needed.
* Count the number of rows needed.
* the phys row count will be equal to
* +1 for the header
* +n that is, one (transaction) row for each split passed in,
@ -1905,7 +1910,7 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
else if (xaccSplitGetParent(split) == save_current_trans) {
save_cursor_phys_row = num_phys_rows;
save_cursor_virt_row = num_virt_rows;
}
}
}
/* if multi-line, then show all splits. If dynamic then
@ -1935,7 +1940,7 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
* except that we also have to find teh saved cursor row,
* Thus, we need a real looop over the splits.
* The do..while will automaticaly put a blank (null)
* split at the end
* split at the end
*/
trans = xaccSplitGetParent (split);
j = 0;
@ -1962,6 +1967,10 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
j++;
} while (secondary);
} else {
/* Try to get as close as possible to the original cell row. */
if (found_split && (split == save_current_split) &&
(save_cell_row < lead_cursor->numRows))
save_cursor_phys_row += save_cell_row;
/* the simple case ... add one row for a transaction */
num_virt_rows ++;
@ -1990,11 +1999,11 @@ xaccSRCountRows (SplitRegister *reg, Split **slist)
save_cursor_virt_row = num_virt_rows + 1;
found_split = GNC_T;
}
num_virt_rows += 2;
num_virt_rows += 2;
num_phys_rows += reg->trans_cursor->numRows;
num_phys_rows += reg->split_cursor->numRows;
} else {
num_virt_rows += 1;
num_virt_rows += 1;
num_phys_rows += lead_cursor->numRows;
}
@ -2035,6 +2044,7 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
int phys_row;
int vrow;
int type, style;
int save_phys_col;
int multi_line, dynamic;
CellBlock *lead_cursor;
gncBoolean found_pending = GNC_F;
@ -2063,8 +2073,14 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
* the cursor to this location when we are done. */
save_current_split = xaccSRGetCurrentSplit (reg);
/* If we are in dynamic mode on a blank split, remember the
* current transaction for determining expansion. */
/* save the current physical column; we'll try to get
* back here after the refresh. */
save_phys_col = reg->table->current_cursor_phys_col;
if (save_phys_col < 0)
save_phys_col = 0;
/* If we are in dynamic mode on a blank split, remember
* the current transaction for determining expansion. */
if (dynamic && (save_current_split == NULL))
info->cursor_hint_trans = xaccSRGetCurrentTrans(reg);
@ -2243,13 +2259,12 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
/* restore the cursor to its rightful position */
{
int row = reg->cursor_phys_row;
int col = reg->cursor_phys_col;
int col = save_phys_col;
if (gnc_table_find_valid_cell_horiz(table, &row, &col, GNC_F))
{
xaccMoveCursorGUI(table, row, col);
reg->cursor_phys_row = row;
reg->cursor_phys_col = col;
if (reg_buffer != NULL)
{

20
src/engine/Transaction.c
Unescape View File

@ -463,9 +463,9 @@ xaccSplitSetBaseValue (Split *s, double value, char * base_currency)
if (!s) return;
/* Novice/casual users may not want or use the double entry
* features of this engine. So, in particular, there
* features of this engine. So, in particular, there
* may be the occasional split without a parent account.
* Well, that's ok, we'll just go with the flow.
* Well, that's ok, we'll just go with the flow.
*/
if (!(s->acc)) {
if (force_double_entry) {
@ -504,10 +504,10 @@ xaccSplitGetBaseValue (Split *s, char * base_currency)
double value;
if (!s) return 0.0;
/* ahh -- stupid users may not want or use the double entry
/* ahh -- users may not want or use the double entry
* features of this engine. So, in particular, there
* may be the occasional split without a parent account.
* Well, that's ok, we'll just go with the flow.
* Well, that's ok, we'll just go with the flow.
*/
if (!(s->acc)) {
if (force_double_entry) {
@ -553,10 +553,10 @@ ComputeValue (Split **sarray, Split * skip_me, char * base_currency)
s = sarray[0];
while (s) {
if (s != skip_me) {
/* ahh -- stupid users may not want or use the double entry
/* ahh -- users may not want or use the double entry
* features of this engine. So, in particular, there
* may be the occasional split without a parent account.
* Well, that's ok, we'll just go with the flow.
* Well, that's ok, we'll just go with the flow.
*/
if (!(s->acc)) {
if (force_double_entry) {
@ -570,7 +570,7 @@ ComputeValue (Split **sarray, Split * skip_me, char * base_currency)
} else {
/* OK, we've got a parent account, we've got currency,
* lets behave like profesionals now, instead of the
* lets behave like professionals now, instead of the
* shenanigans above.
*/
if (!safe_strcmp(s->acc->currency, base_currency)) {
@ -803,10 +803,10 @@ xaccSplitRebalance (Split *split)
/* There are no destination splits !!
* Either this is allowed, in which case
* we just blow it off, or its forbidden,
* in which case we force a balacing split
* in which case we force a balancing split
* to be created.
*
* Note that its ok to have a single split who's amount is zero ..
* Note that its ok to have a single split whose amount is zero.
* this is just a split that is recording a price, and nothing
* else. (i.e. it still obeys the rule that the sum of the
* value of all the splits is zero).
@ -860,7 +860,7 @@ xaccSplitRebalance (Split *split)
#define CHECK_OPEN(trans) { \
if (!trans->open) { \
PERR ("transaction %p not open for editing\n", trans); \
/* assert (trans->open); */ \
/* assert (trans->open); */ \
PERR ("\t%s:%d \n", __FILE__, __LINE__); \
/* return; */ \
} \

1
src/register/splitreg.c
Unescape View File

@ -1148,7 +1148,6 @@ xaccInitSplitRegister (SplitRegister *reg, int type)
/* -------------------------------- */
phys_r = header->numRows;
reg->cursor_phys_col = 0;
reg->cursor_phys_row = phys_r; /* cursor on first line past header */
reg->cursor_virt_row = 1;

4
src/register/splitreg.h
Unescape View File

@ -167,10 +167,8 @@ struct _SplitRegister {
int num_phys_rows;
int num_virt_rows;
int cursor_virt_row;
int cursor_phys_row;
int cursor_phys_col;
int cursor_virt_row;
BasicCell *header_label_cells[NUM_CELLS];

13
src/scm/date-utilities.scm
Unescape View File

@ -10,7 +10,7 @@
;; get stuff from localtime date vector
(define (gnc:date-get-year datevec)
(vector-ref datevec 5))
(+ 1900 (vector-ref datevec 5)))
(define (gnc:date-get-month-day datevec)
(vector-ref datevec 3))
;; get month with january==1
@ -18,14 +18,15 @@
(+ (vector-ref datevec 4) 1))
(define (gnc:date-get-week-day datevec)
(vector-ref datevec 6))
;; jan 1 == 1
(define (gnc:date-get-year-day datevec)
(vector-ref datevec 7))
(+ (vector-ref datevec 7) 1))
;; is leap year?
(define (gnc:leap-year? year)
(if (= (remainder year 4) 0)
(if (= (remainder year 100) 0)
(if (= (remainder (+ year 1900) 400) 0) #t #f)
(if (= (remainder year 400) 0) #t #f)
#t)
#f))
@ -45,8 +46,8 @@
(define (gnc:date-to-year-fraction caltime)
(let ((lt (localtime caltime)))
(+ (- (gnc:date-get-year lt) 1970)
(/ (gnc:date-get-year-day lt) (* 1.0 (gnc:days-in-year
(gnc:date-get-year lt)))))))
(/ (- (gnc:date-get-year-day lt) 1.0)
(* 1.0 (gnc:days-in-year (gnc:date-get-year lt)))))))
;; return the number of years (in floating point format) between two dates.
(define (gnc:date-year-delta caltime1 caltime2)
@ -72,7 +73,7 @@
(define (gnc:date-to-month-fraction caltime)
(let ((lt (localtime caltime)))
(+ (* 12 (- (gnc:date-get-year lt) 1970.0))
(gnc:date-get-month lt)
(gnc:date-get-month lt) -1
(/ (- (gnc:date-get-month-day lt) 1.0) (gnc:days-in-month
(gnc:date-get-month lt)
(gnc:date-get-year lt))))))

251
src/scm/report/budget-report.scm
Unescape View File

@ -17,11 +17,11 @@
(gnc:depend "date-utilities.scm")
;; budget types
;(define gnc:budget-recurring 1) ; regular, recurring budget expenses
; that happen once per period
;(define gnc:budget-contingency 2) ; a budget item where you estimate a
; value over a long period for
; unexpected expenses.
;(define gnc:budget-recurring 1) ; regular, recurring budget expenses
; that happen once per period
;(define gnc:budget-contingency 2) ; a budget item where you estimate a
; value over a long period for
; unexpected expenses.
;; convert a date to a defined fraction
(define (gnc:date-to-N-fraction caltime type)
@ -46,14 +46,41 @@
((gnc:budget-year) (gnc:date-year-delta caltime1 caltime2))
(else (gnc:debug "undefined period type in budget!") #f)))
;; returns the "day number" of the specified period.
(define (gnc:date-to-N-remainder caltime type)
(case type
((gnc:budget-day) 0)
((gnc:budget-week) (gnc:date-get-week-day (localtime caltime)))
((gnc:budget-month) (gnc:date-get-month-day (localtime caltime)))
((gnc:budget-year) (gnc:date-get-year-day (localtime caltime)))
(else (gnc:debug "undefined period type in budget!") #f)))
;; returns the "day number" of the specified period. For example,
;; December 31 is day #92 in a 3 month period.
;; This is one based arithmetic, so the name "remainder" may be slightly
;; confusing.
(define (gnc:date-to-N-remainder caltime type num-periods)
(let ((lt (localtime caltime)))
(case type
((gnc:budget-day) (+ 1
(remainder
(inexact->exact (floor
(gnc:date-to-day-fraction caltime)))
num-periods)))
((gnc:budget-week) (+ (gnc:date-get-week-day lt)
(* 7 (remainder
(inexact->exact
(floor (gnc:date-to-week-fraction caltime)))
num-periods))))
((gnc:budget-month) (+ (gnc:date-get-month-day lt)
(let loop ((month
(inexact->exact
(floor
(gnc:date-to-month-fraction caltime)))))
(if (= 0 (remainder month num-periods))
0
(+ (loop (- month 1))
(gnc:days-in-month
(+ 1 (remainder month 12))
(+ 1970 (quotient month 12))))))))
((gnc:budget-year) (+ (gnc:date-get-year-day lt)
(let loop ((year (gnc:date-get-year lt)))
(if (= 0 (remainder year num-periods))
0
(+ (loop (- year 1))
(gnc:days-in-year year))))))
(else (gnc:debug "undefined period type in budget!") #f))))
;; describe a time type
(define (gnc:date-describe-type type)
@ -63,37 +90,63 @@
((gnc:budget-month) "months")
((gnc:budget-year) "years")))
;; returns the number of days in an n periods of type.
(define (gnc:days-in-period date type n)
(let ((lt (localtime date)))
(case type
((gnc:budget-day) n)
((gnc:budget-week) (* 7 n))
((gnc:budget-month)
(let loop
((month (* (quotient (inexact->exact (floor (gnc:date-to-month-fraction date))) n) n)))
(+ (gnc:days-in-month (+ 1 (remainder month 12))
(+ 1970 (quotient month 12)))
(if (= (remainder month n) (- n 1))
0
(loop (+ 1 month))))))
((gnc:budget-year)
(let loop
((year (* (quotient (inexact->exact (floor (gnc:date-to-year-fraction date))) n) n)))
(+ (gnc:days-in-year (+ 1970 year))
(if (= (remainder year n) (- n 1))
0
(loop (+ 1 year)))))))))
;; define the budget itself. For prototype, define inline.
;; the budget is a vector of vectors. the vectors contain:
;; 0 - description: a string describing the budget line
;; 1 - amount:
;; 2 - accounts: the list of accounts that this line spans
;; (in colon delimited format)
;; 3 - period: the time span of the budget line in #4
;; 4 - period-type:
;; 5 - budget type
;; 6 - triggers???
;; 3 - period: the time span of the budget line
;; 4 - period-type: day, month, year, etc.
;; 5 - budget type: recurring or contingency
;; 6 - window-start: the first possible day in the period that the expenditure can occur on. negative numbers count from the end of the period, zero indicates the last day of the previous period
;; 7 - window-end: the last possible day.
(define budget-entry-structure
(make-record-type
"budget-entry-structure"
'(description amount accounts period period-type budget-type
trigger-day)))
window-start window-end)))
(define (make-budget-entry desc amt acct per ptype budget-type trig-day)
(define (make-budget-entry desc amt acct per ptype budget-type start end)
((record-constructor budget-entry-structure)
desc amt acct per ptype budget-type trig-day))
desc amt acct per ptype budget-type start end))
(define gnc:budget-entries
(list
(make-budget-entry "lunch" 8 '("Food:Lunch") 1
'gnc:budget-day 'gnc:budget-recurring 0)
'gnc:budget-day 'gnc:budget-recurring 1 0)
(make-budget-entry "junk food" 0.50 '("Food:Junk") 1
'gnc:budget-day 'gnc:budget-recurring 0)
'gnc:budget-day 'gnc:budget-recurring 1 0)
(make-budget-entry "car repairs" 2500 '("Car:Repairs") 5
'gnc:budget-year 'gnc:budget-contingency 0)
'gnc:budget-year 'gnc:budget-contingency 1 0)
(make-budget-entry "rent" 312.50 '("Household:Rent") 1
'gnc:budget-month 'gnc:budget-trigger 15)))
'gnc:budget-month 'gnc:budget-trigger -1 2)
(make-budget-entry "car payments" 374.80 '("Car:Loan Payments") 1
'gnc:budget-month 'gnc:budget-trigger 13 17)
(make-budget-entry "car 2" 374.80 '("Car:Loan Payments") 1
'gnc:budget-month 'gnc:budget-trigger 20 20)))
(define (budget-entry-get-description budget-entry)
((record-accessor budget-entry-structure 'description) budget-entry))
@ -110,8 +163,11 @@
(define (budget-entry-get-period-type budget-entry)
((record-accessor budget-entry-structure 'period-type) budget-entry))
(define (budget-entry-get-trigger-day budget-entry)
((record-accessor budget-entry-structure 'trigger-day) budget-entry))
(define (budget-entry-get-window-start budget-entry)
((record-accessor budget-entry-structure 'window-start) budget-entry))
(define (budget-entry-get-window-end budget-entry)
((record-accessor budget-entry-structure 'window-end) budget-entry))
(define (budget-description-html-proc)
(lambda (budget-line)
@ -143,10 +199,15 @@
(gnc:date-describe-type
(budget-entry-get-period-type (budget-line-get-entry budget-line))))))
(define (budget-trigger-day-html-proc)
(define (budget-window-start-html-proc)
(lambda (budget-line)
(html-number-cell
#f #f "%i" (budget-entry-get-trigger-day (budget-line-get-entry budget-line)))))
#f #f "%i" (budget-entry-get-window-start (budget-line-get-entry budget-line)))))
(define (budget-window-end-html-proc)
(lambda (budget-line)
(html-number-cell
#f #f "%i" (budget-entry-get-window-end (budget-line-get-entry budget-line)))))
;; budget report: a vector with indexes corresponding to the budget
;; 0 - actual: the amount spend / recieved
@ -162,11 +223,11 @@
(make-record-type
"budget-report-structure"
'(actual budgeted num-periods minimum-expected maximum-expected
time-remaining num-triggers)))
time-remaining num-triggers-upper num-triggers-lower)))
(define (make-empty-budget-report)
((record-constructor budget-report-structure)
0 0 0 0 0 0 0))
0 0 0 0 0 0 0 0))
(define (budget-report-get-actual brep)
((record-accessor budget-report-structure 'actual) brep))
@ -186,8 +247,11 @@
(define (budget-report-get-time-remaining brep)
((record-accessor budget-report-structure 'time-remaining) brep))
(define (budget-report-get-num-triggers brep)
((record-accessor budget-report-structure 'num-triggers) brep))
(define (budget-report-get-num-triggers-upper brep)
((record-accessor budget-report-structure 'num-triggers-upper) brep))
(define (budget-report-get-num-triggers-lower brep)
((record-accessor budget-report-structure 'num-triggers-lower) brep))
(define (budget-actual-html-proc)
(lambda (budget-line)
@ -219,10 +283,15 @@
(html-number-cell #f #f "%.1f" (budget-report-get-time-remaining
(budget-line-get-report budget-line)))))
(define (budget-num-triggers-html-proc)
(define (budget-num-triggers-upper-html-proc)
(lambda (budget-line)
(html-number-cell #f #f "%.0f" (budget-report-get-num-triggers
(budget-line-get-report budget-line)))))
(html-number-cell #f #f "%.0f" (budget-report-get-num-triggers-upper
(budget-line-get-report budget-line)))))
(define (budget-num-triggers-lower-html-proc)
(lambda (budget-line)
(html-number-cell #f #f "%.0f" (budget-report-get-num-triggers-lower
(budget-line-get-report budget-line)))))
(define budget-line-structure
(make-record-type "budget-line-structure"
@ -267,7 +336,7 @@
(define (budget-calculate-expected! budget-line)
(let ((brep (budget-line-get-report budget-line))
(entry (budget-line-get-entry budget-line)))
; fixme: contingency type budget entries may have a lower minimum
; fixme: contingency type budget entries may have a lower minimum
((record-modifier budget-report-structure 'minimum-expected) brep
(* (budget-entry-get-amount entry)
(floor (budget-report-get-num-periods brep))))
@ -285,19 +354,87 @@
(* (- (ceiling periods) periods)
(budget-entry-get-period entry)))))
;; calculate the number of times the trigger day occurs in the budget
;; calculate the number of times the trigger window occurs in the budget
;; period
(define (budget-calculate-num-triggers! budget-line begin-date end-date)
(let* ((entry (budget-line-get-entry budget-line))
(brep (budget-line-get-report budget-line))
(N-type (budget-entry-get-period-type entry))
(trigger-day (budget-entry-get-trigger-day entry)))
((record-modifier budget-report-structure 'num-triggers) brep
(+ -1
(if (<= (gnc:date-to-N-remainder begin-date N-type) trigger-day) 1 0)
(if (>= (gnc:date-to-N-remainder end-date N-type) trigger-day) 1 0)
(- (floor (gnc:date-to-N-fraction end-date N-type))
(floor (gnc:date-to-N-fraction begin-date N-type)))))))
(let ((entry (budget-line-get-entry budget-line)))
(let ((brep (budget-line-get-report budget-line))
(N-type (budget-entry-get-period-type entry))
(window-start (budget-entry-get-window-start entry))
(window-end (budget-entry-get-window-end entry))
(psize (budget-entry-get-period entry)))
; convert negative numbers to positive numbers
(let ((trig-start-A (if (> window-start 0)
window-start
(+ window-start
(gnc:days-in-period
begin-date N-type psize))))
(trig-start-B (if (> window-start 0)
window-start
(+ window-start
(gnc:days-in-period
end-date N-type psize))))
(trig-end-A (if (> window-end 0)
window-end
(+ window-end
(gnc:days-in-period
begin-date N-type psize))))
(trig-end-B (if (> window-end 0)
window-end
(+ window-end
(gnc:days-in-period
end-date N-type psize))))
(possible 0)
(sure 0)
(report-start (gnc:date-to-N-remainder begin-date N-type psize))
(report-end (gnc:date-to-N-remainder end-date N-type psize)))
; special case if report start and end are in same period
(cond ((= (floor (/ (gnc:date-to-N-fraction end-date N-type) psize))
(floor (/ (gnc:date-to-N-fraction begin-date N-type) psize)))
(cond ((<= trig-start-A trig-end-A)
(cond ((> report-start trig-end-A) #f)
((< report-end trig-start-A) #f)
((or (> report-start trig-start-A)
(< report-end trig-end-A))
(set! possible 1))
(else (set! sure 1))))
(else
(if (<= report-start trig-end-A)
(set! possible 1))
(if (>= report-end trig-start-A)
(set! possible (+ possible 1))))))
; not in same period.
(else
; first calculate terminal periods
(cond ((<= trig-start-A trig-end-A)
(cond ((> report-start trig-end-A) #f)
((<= report-start trig-start-A)
(set! sure (+ sure 1)))
(else (set! possible (+ possible 1))))
(cond ((< report-end trig-start-B) #f)
((>= report-end trig-end-B) (set! sure (+ sure 1)))
(else (set! possible (+ possible 1)))))
(else
(if (<= report-start trig-end-A)
(set! possible (+ possible 1)))
(if (>= report-end trig-start-B)
(set! possible (+ possible 1)))
(if (or (> report-start trig-start-A)
(< report-end trig-end-B))
(set! possible (+ possible 1))
(set! sure (+ sure 1)))))
; then add intermediate periods
(set! sure (+ -1 sure
(inexact->exact
(- (floor (/ (gnc:date-to-N-fraction
end-date N-type) psize))
(floor (/ (gnc:date-to-N-fraction
begin-date N-type) psize))))))))
; now save 'em into the record
((record-modifier budget-report-structure 'num-triggers-lower) brep
sure)
((record-modifier budget-report-structure 'num-triggers-upper) brep
(+ sure possible))))))
;; given an account name, return the budget line
;; return #f if there is no budget line for that account
@ -354,7 +491,7 @@
(gnc:make-multichoice-option
"Report Options" "View"
"c" "Type of budget report"
'status
'full
(list #(full
"Full"
"Show all columns")
@ -378,9 +515,9 @@
(let* ((begindate (gnc:lookup-option options "Report Options" "From"))
(enddate (gnc:lookup-option options "Report Options" "To"))
(begin-date-secs (car (gnc:timepair-canonical-day-time
(gnc:option-value begindate))))
(gnc:option-value begindate))))
(end-date-secs (car (gnc:timepair-canonical-day-time
(gnc:option-value enddate))))
(gnc:option-value enddate))))
(budget-list (map
(lambda (entry)
(make-budget-line entry (make-empty-budget-report)))
@ -425,14 +562,16 @@
"Period"
""
"Actual"
"Trigger Day"
"Window Start"
"Window End"
"Budgeted"
"Number of Periods"
"Lower Limit"
"Upper Limit"
"Time Remaining"
""
"Num Triggers"))
"Num Triggers Upper"
"Num Triggers Lower"))
(set! report-procs (list
budget-description-html-proc
budget-amount-html-proc
@ -440,14 +579,16 @@
budget-period-html-proc
budget-period-type-html-proc
budget-actual-html-proc
budget-trigger-day-html-proc
budget-window-start-html-proc
budget-window-end-html-proc
budget-budgeted-html-proc
budget-num-periods-html-proc
budget-minimum-expected-html-proc
budget-maximum-expected-html-proc
budget-time-remaining-html-proc
budget-period-type-html-proc
budget-num-triggers-html-proc)))
budget-num-triggers-upper-html-proc
budget-num-triggers-lower-html-proc)))
((balancing)
(set! report-headers (list
"Description"

Write Preview
Loading…
Cancel
Save