Commit Graph

90 Commits

Author SHA1 Message Date
abijah
50eb7c0f5d Merge out from the pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@810 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-28 20:48:52 +00:00
abijah
43c957baa2 Added users and groups and a couple basic options (dev & admin) for testing. Since dev/admin is now a database option, the special routing mechanism has been removed.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@801 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-28 04:47:33 +00:00
abijah
7904372dff Added support for permissions. Next is to implement some.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@798 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-28 03:32:07 +00:00
abijah
fbc2de9427 Merge out from the pre_0.1 branch (previous so called 'merge in' was also really a merge out)
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@796 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-27 17:28:12 +00:00
abijah
f5f09421c1 Changed submenu ordering
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@795 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-27 17:27:07 +00:00
abijah
0e8b541e34 Merge in from the pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@794 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-27 17:23:22 +00:00
abijah
439e9a3de6 Implemented the UnitSize controller and view. I would like to add controller navigation links for 1bd, 2bd, 3bd, and so on. Also, we need to make the number of available units part of the grid. It will require breaking a separate CountTables function, since we'll need to join with Units, but it shouldn't be a big deal. Whether or not we include occupancy percentage, or leave that to a report is undecided.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@782 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 15:56:42 +00:00
abijah
caee1c90a1 Removed the unecessary code, now that it has been checked in.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@781 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 06:26:53 +00:00
abijah
08486fc101 Work to try and ensure that the most useful menu is shown by default on each page.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@780 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 06:25:37 +00:00
abijah
b2a85a5197 Added lock/unlock links directly on the unit page. Also, found the grid view links seem to be needed even when not already navigating a grid. Without them, the user must go first through the top level navigation link, then to the specific grid subset. It's a bit painful, and so I decided to add them back in. To facilitate this, instead of repeatedly changing each controller whenever we change our minds, I added a new virtual function to that app. I'll change the remaining controllers on the next checkin.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@776 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 02:29:29 +00:00
abijah
f8cdea8872 Renamed the Operations menu area to Actions
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@775 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 01:26:52 +00:00
abijah
56bec8d05c Fixed a problem where the operations menu was showing up at inappropriate times (a problem we already solved, but accidentally left commented out on an earlier checkin). Also, since the sitemap is a top level operation that is not based on gridView, enabled the site operations menu explicitly from within the maps controller.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@773 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 01:18:53 +00:00
abijah
03d947a069 Added top level operations into the sidemenu
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@768 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-24 21:48:09 +00:00
abijah
c261735197 Added automated disabling of admin and development menu items (at least the ones that are explicitly added to those sections of the menu).
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@765 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-24 20:03:05 +00:00
abijah
ee9ff354b2 Added functionality to pre-activate a specific area/subarea of the menu.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@752 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-23 20:23:44 +00:00
abijah
89d7f22e4a Small tweak to prevent the render error when looking at a debug grid query.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@749 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-23 19:23:12 +00:00
abijah
3e78240974 Modified to use the sandbox database
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@746 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-23 18:49:20 +00:00
abijah
da88975fed More work on tidying up the menu items for usability.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@735 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-23 00:02:53 +00:00
abijah
f545502162 Changed how sidemenu links work, so that order of execution doesn't have to control ordering of the list.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@734 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-22 22:47:41 +00:00
abijah
90ecbda541 Several minor changes including a couple minor bugfixes.
git-svn-id: file:///svn-source/pmgr/branches/surplus_account_20090815@592 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-17 02:15:02 +00:00
abijah
170ba466de Cleaned up several places regarding redirect and rendering during development for debug purposes. Also, added a link to the intended redirect target when we've rendered instead. These changes haven't been tested, hopefully they are benign.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@563 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:49:42 +00:00
abijah
778bb43895 Modified INTERNAL_ERROR to support inclusion of the blank layout, since all the javascript is lost otherwise. This should only matter for development. Also, fixed a bug with rendering when redirect is called but headers have already been output.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@560 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 21:10:16 +00:00
abijah
b7a77757f9 Fixed a couple URL problems, including redirect, which was previously entirely unable to utilize our AppHelper for the url generation. Added a couple menu items into the Admin section. Changed debug to be OFF for any route other than the 'dev' one.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@551 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-14 18:11:33 +00:00
abijah
091920d80a Changed the default of the debug flag when generating grid data. The original intention was to have it debug by default, so that debugging would be on if the url were manually typed in. That has never been needed though, and this change not only results in cleaner logic, it makes sure we have no issues with routing.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@546 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 20:07:49 +00:00
abijah
1511986ed0 Changed the custom route variables, so that the dev route could set the admin flag and not screw up the routing. The AppController now checks the routing params to set the dev/admin flags.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@545 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 16:43:07 +00:00
abijah
a2014a916e Added cached fields for charged_through and paid_through dates of a lease. Also, added the ability to dynamically determine whether a unit is late or not. In reality, we really need this to be part of the lease, not one of the status types for unit. The sitemap, however, is driven from unit information, so it's not clear whether we should move that information or not.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@543 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-13 02:37:37 +00:00
abijah
1d27b4dcb5 Many bug fixes, found while entering real facility data. Most are quite minor, although there was a functionality change to assignCredits, to support concessions without assigning them to anything other than rent. I've found that there is a glaring problem with charge reversals, which don't work correctly with the collected report. Of course, we're deleting prior disbursements, which obviously needs to be rectified.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@540 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-12 09:37:49 +00:00
abijah
6f2038f7b0 Added ability to customize the action on grid links
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@537 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-11 17:30:12 +00:00
abijah
19f8c18ce9 Removed the two dangerous links from the Debug menu, as we're preparing to enter new data and don't want to zap it.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@517 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-10 19:20:29 +00:00
abijah
76df8c924f Changed the Deposits menu item to be at the top level, instead of underneath the Accounts menu.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@512 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-10 05:48:49 +00:00
abijah
58c4f28956 Added mechanism to do a full replacement of specified post parameters, instead of just merging.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@495 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-06 18:06:57 +00:00
abijah
a5d3ff0b70 Added the ability to suppress logging at display time. I'd like to add an additional log level, the first which passes or suppresses the print, and the second which defaultly displays or hides the output. Perhaps next checkin.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@474 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-03 19:41:49 +00:00
abijah
bbec6ccbb6 Fixed a bug where the condition is of the form array('field' => null). That's a valid condition, but was being treated the same as array('field'). This resolves it, although it will break anyone using the gridDataFilterConditionsStatement virtual function. I don't think anyone is at the moment, although I didn't check.
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@450 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-31 03:46:59 +00:00
abijah
876d9b3d33 The conditions were clamped down too tight, as they prevented something like 'Table.field !='
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@433 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-30 21:34:03 +00:00
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