abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,462 Commits 31 Branches 9 Tags
v0.3_php5.3_support
Commit Graph

106 Commits

Author SHA1 Message Date
abijah
424cb0ea4f Tweaked filtering to allow for non-trivial conditions 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@431 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 20:59:33 +00:00
abijah
63de30d392 Modified the filtering behavior; A filter specified as 'Table.field' results in the obvious split (Table, field); 'Table' results in (Table, id); 'field' results in (ModelTable, field). Fixed a bug in the app controller which was allowing 'fields' to leak into the top level of 'link' 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@430 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 19:45:19 +00:00
abijah
07232c77d5 Moved the filtering split to a virtual function. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@429 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-30 19:07:21 +00:00
abijah
f6ee56501d Got the collected reports working again. NSF hasn't been tested yet, because NSF entry is not yet working. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@402 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-28 16:08:15 +00:00
abijah
a5565546d1 Half-kludgy fix to a filtering bug when a table is already specified using the simple notation, e.g. array('Table'), instead of the more complete form array('Table' => array(...)) 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@397 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-28 02:39:44 +00:00
abijah
f9635419dd Added transaction stats. Added (possibly unwanted) columns. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@389 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-25 08:06:50 +00:00
abijah
9a32800170 Fixed a bug with idlist caused when we moved all the post data into the 'post' field 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@373 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 23:45:04 +00:00
abijah
9dccbfeda8 Modified Filtering to have a separate virtual function for Tables and Conditions. This was prompted because a derived controller could override the function to return null to prevent adding a filtering table (such as if the table was already added as a non top-level table), and although the app controller would correctly prevent adding the filter table to the set, it would also prevent adding the filter condition as well. So, making two virtual functions, one for table name when defining filter tables, and one for table name when defining filter conditions, allows the derived controller to stop a table from being added to the set, yet still let the condition through (without having to override the entire filter condition logic). 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@370 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 16:51:32 +00:00
abijah
234999b4d2 Many, many changes, and yet still much to do. Many things are working, but certainly nothing beyond simply data retrieval (no editing or adding of any data). Also, some work is still required to ensure the grids have the right columns; we can strip out certain columns for some views (such as removing customer from the leases grid of the customer view... completely redundant). And of course, there are still many bugs and lots to clean up. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@368 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 01:49:46 +00:00
abijah
0ba5007438 Changed the default table configuration to be link instead of contain. contain was never really desired, it just got thrown in there since it wasn't clear how link would behave, and we needed the essential effect of recursive=-1. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@367 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-23 01:11:30 +00:00
abijah
c596dfa5f0 Added automagic filtering capability to the app controller. Also, lumped all items needing serialization into a single 'post' item, instead of continuing to piecemeal each added post item. There will be some changes required to some controllers, since custom post data has changed location, but it should be minor. To make use of the new filtering methods, each view will have to set the 'filter' parameter at the time of grid setup. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@365 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-22 23:31:41 +00:00
abijah
7aa026f4e0 Renamed jqGridData functions to be just gridData. Restructured the virtual function calls with an anticipated need for gridDataCount to be overridden as a whole, instead of just overriding the individual pieces. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@361 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-22 17:06:44 +00:00
abijah
93ebc450fe Making progress. Much still to do, but there are hints of functionality finally returning so I'm snapshotting. 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@360 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-21 10:23:52 +00:00
abijah
8fcecb7092 Added generic mechanism to add userdata to the grid results. A 'userdata' callout function would be nice, but in practice, userdata may get added anywhere along the line, which is much easier than trying to figure out when to call such a callout and what parameters it would need to be passed. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@338 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-15 07:44:51 +00:00
abijah
b97d071bb4 New generic mechanism for subtotaling columns. This is NOT an ideal solution, as it only subtotals for the current grid page. Hopefully we can get something better into the app controller at some point 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@321 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 20:15:56 +00:00
abijah
d6be905c08 Added a couple more virtual functions for more controller flexibility. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@319 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 18:34:24 +00:00
abijah
6e1c684a06 Implemented a list that checks for collected rents. There is AccountsController::collected, which I'm keeping at the moment, but I decided to move the logic into ledger_entries, since ultimately that's what we want a list of and it doesn't make sense to add a bunch of LedgerEntry logic into the jqGrid query of AccountsController. Of course, right now there is hardcoded calendar functions, and hardcoded exclusion of the Concession Account. I will probably offer up two calendars to provide a range, and a list of checkboxes of each payable account. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@318 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-12 18:01:01 +00:00
abijah
288e4c05de Added debug link to create all new ledgers 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@311 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-11 15:37:52 +00:00
abijah
d09af4f475 More work to make the db scripts general 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@266 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 21:49:00 +00:00
abijah
437ebabfd3 Removed the hardcoded script location, and added some extra debug information 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@265 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 21:33:52 +00:00
abijah
a2cb53a83b Actually, we need to get away from calling things jqGrid except at the lowest point. We don't want to switch vendors and have all these items continuing to be called jqGrid. Just Grid will work. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@258 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 17:35:36 +00:00
abijah
dff8394e91 Added a helper to jqGrid, since duplicated code is getting spread through each element. The implementation is nowhere near complete, but the basic idea is there. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@257 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-08 17:33:43 +00:00
abijah
3f275b127b Implemented the balance field of Leases as part of a single query. This not only reduces the number of queries required, it also allows balance to be a sortable column, so that we can determine which customers are overdue. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@251 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-07 16:08:56 +00:00
abijah
f6401c92be Moved menu items unintended for long term into a 'Debug' section of the sidemenu bar 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@205 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-04 04:13:09 +00:00
abijah
d77dcfca75 Added ability to move an existing customer into a vacant unit. Changed out all of the 'amount' fields with 'rent', since it's much more self-explanatory. We still need the ability to add customers and contacts. I'll consider doing this by using the insert row ability of jqGrid. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@204 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-03 06:53:41 +00:00
abijah
3ad0cc1d20 Added link to quickly reset the site data. This will help external testers as they won't have to worry about screwing up the data. Obviously, this is for debug purposes only and will need to be removed before going live. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@197 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 01:40:32 +00:00
abijah
ce4fa4131a More changes. I just can't seem to come up with a solution that works that I like. The problem now, without invoice/receipt, is that one check cannot cleanly pay for two units. 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@182 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-24 00:33:39 +00:00
abijah
80f8bd36d5 Nowhere near done yet, but checking in a snapshot of semi-working code. There is some simultaneous support for both with and without use of the Invoice/Receipt account. I want to do away with them completely, but will need to change how sitelink payments are mapped (right now, they split a payment into multiple parts to match the charge). 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622@181 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-23 19:04:41 +00:00
abijah
3e5ac64108 Although I'm not too happy with the modifications, I do have a working version that minimizes the columns need to display ledger entries. The logic feels screwy to me, but I've beat my head on it long enough. I'll move on to something else and come back to it when my head clears. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@166 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:57:43 +00:00
abijah
ede1053de4 Added a virtual callout for grouping 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@149 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:36:19 +00:00
abijah
4d2b4779d4 Fixed bug created when controller was added as an optional parameter to Links 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@146 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 04:48:52 +00:00
abijah
388dbc0540 Added accounts to the ledger entry grids, since it's tough to figure out what's going on without them. This exposed a problem with the controller name automatically being determined in the Links function, so it now looks for an optional controller parameter. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@141 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 23:22:38 +00:00
abijah
543e2daa43 Moved the ledger_entries controller/view to jqGrid. 
Changed the app controller jqGrid virtual functions for getting the tables for both count and the full query.  The ExtraTables bit was too confusing, and was only intended to allow the user to specify a subset for count and augment it for full query.  This is easily accomplished by having DataTables just call DataCountTables first... one line solution ends the confusion.

Modified linkable behavior to support a %{MODEL_ALIAS} tag, which is replaced in the relationship conditions at runtime with the actual model alias.  This is experimental at best, and certainly will create a problem for any model that ends up using the conditions in 'contain' instead of 'link'.

Broke the LedgerEntry->findInLedgerContext function out into multiple pieces, so those same pieces could be used in the LedgerEntries controller to populate jqGrid.

Changed the ledger_entries element, as a special case, to also allow listing control from ledger_id and account_type, instead of idlist as a mechanism for populating the grid.

Changed the infobox summary css, which will break several pages until I rework them.

Some next steps include fixing the broken infoboxes, and changing the transactions view to use the ledger_entries element.  This also means the ledger_entries element will need to add support for idlist, or if we have any credit/debit issues, perhaps another custom transaction_id instead.



git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@134 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 19:41:20 +00:00
abijah
39071b39fb Moved ledgers over the jqGrid. Working reasonably well at the moment. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@131 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 06:22:38 +00:00
abijah
1890a0490e Added mechanism to easily create links in the listing grids. I'm not very keen on how it works, but it's good enough for the moment, unless/until I figure out how to push this to the view. If it should stay in the controller, I'm sure a more sophisticated mechanism will be required. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@128 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 02:50:21 +00:00
abijah
015e6b082d Fixed a bug in which jqGrid would fetch data from the current controller, not the controller responsible for populating the data. Added the ability to fetch data based strictly off of an ID list, which is useful for lists that are embedded in other pages, where the list conditions are entirely foreign to the controller responsible for providing the data. To assist with this one jqGrid virtual function needed the model added as a parameter, so I added it to them all and modified the jqGrid functions in the existing derived controllers. Right now the elements (such as contacts.ctp, the only working one) receive a full list of data to populate themselves. I could have simply taken this and passed it directly to jqGrid, with no need for further server interaction. However, this could result in some very large lists, and although pagination will ensure the user is not overwhelmed, the connection or the browser could be. Unless we have a strong performance need, I'll keep it this way. In the meantime, I'll leave the underlying data available to each element, in case I have to switch over. When all is proven out, I can simplify all the queries such that the extra data is never requested in the first place. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@122 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 22:05:44 +00:00
abijah
404323c6c1 Moved contacts onto jqgrid. Added 'name' and 'longname' formats. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@120 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 20:24:36 +00:00
abijah
c90830d41a Made the app controller include the action by default. Added virtual callouts for data order and limit. Changed fields to use formatting, including a custom format for currency and id. Added a function for auto conversion from PHP variables to javascript. Fixed some minor bugs in the controllers already converted to jqGrid. Moved leases onto jqGrid. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@118 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 19:50:09 +00:00
abijah
f6ca79d1a9 Moved units onto jqGrid. Also generalized the jqGridSetup (now jqGridView) function and moved it into the app controller. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@117 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:33:30 +00:00
abijah
6b8d05f2a0 Yanked the multicolumn toolbar, and returned to my simple text boxes. I will probably end up going with these search boxes, or the modal box (perhaps with autosearch) if I can't come up with a better idea. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@114 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 04:40:47 +00:00
abijah
336ec3b643 Got the mulitcolumn search toolbar in place, but it's not working. First I haven't managed to get an autosearch working (searching as you type). Second, and much more critically, I don't have the controller correctly responding to search terms, as it was implemented rather poorly. I'm moving on for now. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@113 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 03:22:53 +00:00
abijah
b4d640f7c2 Testing implementation of an autosearch functionality, which works. Probably wasted, as I suspect I can get this directly out of jqGrid 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@112 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 01:27:58 +00:00
abijah
90a16c721e Split the jqGrid code out a bit further, giving the application controller full responsibility for handling the jqGrid requests. Virtual functions have been added to allow a derived controller to customize this action as needed. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@111 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 00:53:08 +00:00
abijah
3be775f9b2 Added query ability to the customer grid. There is a bug with the paging code, but it roughly works. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@109 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 21:20:11 +00:00
abijah
0278c77610 Things are finally working fairly well for the customers grid (although I've not yet taken any speed issues into account). I removed the index.ctp file, since it was largely useless and I figured out how to render directly to the element. I also moved most of the jqGrid XML code into the application controller, since it will be reused by most of our controllers. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@108 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 20:46:17 +00:00
abijah
c80c66d958 FIrst pass implementation to accept payments. Nowhere near complete, but things are working relatively well, and I have a plethora of different attempts saved in comment blocks. I really want to clean up though, so I'm snapshotting it. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@99 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-12 01:49:24 +00:00
abijah
d3c7011fc8 It seems that the Javascript helper is automatically included, but not if there is a problem with the controller, such as if an action is missing. In this case the user sees a useless error message instead of the normal 'action missing' one. By manually adding the Javascript helper, that problem should go away. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@97 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-11 00:17:13 +00:00
abijah
8ab8d087e6 Added the debug toolkit plugin, found on the bakery website. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@92 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 21:12:59 +00:00
abijah
f8eb45a0b9 Added lease and ledger_entry controllers/views. Minor bugfixes as well. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@85 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 08:53:22 +00:00
abijah
9f8d4fa9b2 Significant changes to work with the new account/ledger structure. Removed much of the auto-generated model association code. Added helper functions into the models to perform model related work, such as model 'stats' (a bad name for a function to return a summary of pertinent financial information from a given model instance). There is a ton of cleanup to do, but first I want to get it all captured. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@81 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-10 02:41:23 +00:00