dinislage/redmine_contracts
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
410 Commits 10 Branches 1 Tag
f7f53e4ac1b235d4ce95961ba28b683e3ae5b4cd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Davis f7f53e4ac1 [#6636] Style change on the finance report to be horizontal 2011-10-13 13:33:47 -07:00
Eric Davis f4fb025c13 [#6636] Add Users/Overhead table to the deliverable finance report 2011-10-13 11:30:25 -07:00
Eric Davis 084ab1dd96 [#6636] Add Users/Labor table to the deliverable finance report 2011-10-13 11:16:24 -07:00
Eric Davis f972efffbf [#6636] Add Deliverable#spent_for_user to get the billable/non-billable cost by user 2011-10-13 11:07:31 -07:00
Eric Davis 19ec0f6c43 [#6636] Add Deliverable#hours_spent_for_user to get the billable/non-billable hours by user 2011-10-13 11:02:23 -07:00
Eric Davis 2d39a4063a [#6636] Add methods to Deliverable to find users with billable/non-billable time 2011-10-13 10:51:39 -07:00
Eric Davis bfe35fb1c8 [#6636] Show overage amounts on the deliverable finance report 2011-10-13 10:21:58 -07:00
Eric Davis 1e584178c9 Fix tests from changes in element ids (duplicated) 2011-10-13 10:14:17 -07:00
Eric Davis b695e09be6 [#6636] Remove #content css scope so styles can apply to lightbox 2011-10-13 09:59:13 -07:00
Eric Davis fa4224ddfc [#6636] Major fixes to the CSS to share styles with other pages 2011-10-13 09:56:05 -07:00
Eric Davis acc825a4fe [#6636] Add overhead table to the deliverable finance report 2011-10-13 09:28:31 -07:00
Eric Davis 1f9cd9e86f Refactor: extract to test helper 2011-10-13 09:05:58 -07:00
Eric Davis 3e1606c28d [#6636] Show labor totals in deliverable finance report 2011-10-13 08:55:20 -07:00
Eric Davis 1bbce5457f [#6636] Show deliverable calculations for Labor in the finance lightbox 2011-10-12 15:58:19 -07:00
Eric Davis 7380246594 [#6636] Add Deliverable calculation methods based on activity 2011-10-12 15:43:06 -07:00
Eric Davis 4d2b202492 Refactor: extract test method to create an issue and time entry for a deliverable 2011-10-12 15:14:43 -07:00
Eric Davis c8371854cb [#6636] Add an action to show deliverable finances 2011-10-12 14:18:59 -07:00
Eric Davis ba0ed4a137 [#6636] Added a static jquery ui lightbox to Labor and Overhead links 2011-10-12 11:40:03 -07:00
Eric Davis f820308638 [#6636] Upgrade jquery from 1.4.2 to 1.4.4 2011-10-12 11:36:44 -07:00
Eric Davis 5ac2c08a4d Merge branch '6574-budgets-by-activity' 2011-10-12 10:57:21 -07:00
Eric Davis f269f4ae9b Test update for new field 2011-10-11 16:17:37 -07:00
Eric Davis 6fa8b3f2e7 [#6574] Generate new ids for fixed descriptions for the jsToolBar 2011-10-11 16:03:25 -07:00
Eric Davis 0d6ee39f42 [#6574] Add wiki toolbars to each new finance item 2011-10-11 15:53:56 -07:00
Eric Davis 3479ded9a6 [#6574] Allow adding and removing Fixed Budgets 2011-10-11 15:19:12 -07:00
Eric Davis 7e818d75a7 [#6574] Refactor: extract fixed budget form to partial 2011-10-11 14:50:31 -07:00
Eric Davis 2ef8cd9b4e [#6574] Allow creating and deleting multiple overhead budgets 2011-10-11 14:45:49 -07:00
Eric Davis ce6c89cfa7 [#6574] Extract method from addNewDeliverableLaborItem 2011-10-11 14:21:18 -07:00
Eric Davis ca84747cb9 [#6574] Refactor: extract overhead budget form to partial 2011-10-11 14:12:52 -07:00
Eric Davis ffaab6b92d [#6574] Fix test 2011-10-11 14:07:04 -07:00
Eric Davis d170eb1d18 [#6574] Handle a missing labor budget template 2011-10-11 13:55:27 -07:00
Eric Davis 7894bf204f [#6574] Store deleted finances in a hidden HTML table 2011-10-11 13:50:40 -07:00
Eric Davis 2653e80a5f [#6574] Confirm removal in JS and handle removing the last labor item 2011-10-11 13:49:49 -07:00
Eric Davis d633b32b30 [#6574] Allow removing labor budgets 2011-10-11 11:44:16 -07:00
Eric Davis 7d0abc641a [#6574[ Scope the Labor Budget Add button with a css class 2011-10-11 10:19:17 -07:00
Eric Davis 237b220795 [#6574] Add button for multiple Labor Budgets 2011-10-11 10:17:47 -07:00
Eric Davis f0445324ea Remove metrics task 2011-10-11 10:17:03 -07:00
Eric Davis 77b105530f Fix typo in the GC patch 2011-09-20 09:31:37 -07:00
Eric Davis b98703cddf [#6574] Move LaborBudget sort to Ruby so new records aren't excluded 2011-09-15 13:44:13 -07:00
Eric Davis 6bff73db93 [#6574] Add a Labor Budget JS template for adding more budget items 
The JS template is generated by Rails for adding a new record
and gets appended to the finance section using
addNewDeliverableFinance() (JS).
 2011-09-15 13:26:33 -07:00
Eric Davis a6582c9d01 Refactor: extract to common method 2011-09-15 10:58:27 -07:00
Eric Davis 33e07ee10b [#6574] Add a TimeEntryActivity to OverheadBudgets 2011-09-15 10:38:16 -07:00
Eric Davis b3b7fa11b0 Add tweaks for Ruby's GC to speed up tests 2011-09-14 19:02:50 -07:00
Eric Davis df61a1fe9e [#6574] Associate LaborBudgets with TimeEntryActivities 2011-09-14 18:39:49 -07:00
Eric Davis 38c22e2f92 Workaround a regression in ChiliProject 2.x with setting journal attributes 
https://www.chiliproject.org/issues/622
 2011-09-14 13:31:43 -07:00
Eric Davis 668b1e0991 [#6573] Add the total spent and total budget to the deliverable row 2011-09-14 13:13:46 -07:00
Eric Davis f5ca74e420 [#6441] Don't include a blank status as an option 2011-08-12 11:02:13 -07:00
Eric Davis 066f46b9bf Merge branch '6441-contract-and-deliverable-status' 2011-08-10 16:12:11 -07:00
Eric Davis 5e50eb7558 [#6441] Block deleting deliverables on closed or locked contracts 2011-08-10 16:07:07 -07:00
Eric Davis bf1339fc61 [#6441] Block creating deliverables on closed or locked contracts 2011-08-10 15:53:36 -07:00
Eric Davis 256325a39d [#6441] Refactor: extract method 2011-08-10 15:21:45 -07:00
Eric Davis e0ecae8220 [#6441] Remove dead code 2011-08-10 15:18:37 -07:00
Eric Davis b99f57f51c [#6441] Use a string so the flow is clearer 2011-08-10 15:16:54 -07:00
Eric Davis edc9e84719 [#6441] Refactor: extract and move method 2011-08-10 15:15:26 -07:00
Eric Davis 2f77619fef [#6441] Refactor: remove unneeded contract arg 2011-08-10 15:13:01 -07:00
Eric Davis 6357fd83e4 [#6441] Refactor: extract method 2011-08-10 15:11:45 -07:00
Eric Davis 1b4191dc15 [#6441] Don't hide or disable the issue's current deliverable 2011-08-10 15:07:44 -07:00
Eric Davis e019a9435e [#6441] Hide and disable unassignable deliverables from the issue 
* Hide - Closed deliverables
* Hide - Closed contract deliverables
* Disable - Locked deliverables
* Disable - Locked contract deliverables
 2011-08-10 13:10:05 -07:00
Eric Davis f70ade5011 [#6441] Block assigning issues to deliverable on a locked or closed contract 2011-08-10 12:09:09 -07:00
Eric Davis 495407f127 [#6441] Block editing deliverables on locked and closed contracts 2011-08-10 11:56:08 -07:00
Eric Davis be37e00f10 [#6441] Block editing locked and closed contracts 2011-08-10 11:31:54 -07:00
Eric Davis f8fe23a68d [#6441] Refactor: extract method in the complex validation 2011-08-09 16:17:18 -07:00
Eric Davis 7c23725bbd [#6441] Refactor: merge i18n strings by passing in a reason and object 2011-08-09 15:59:24 -07:00
Eric Davis 2f79493cca [#6441] Block logging time on locked contracts and deliverables 2011-08-09 15:48:46 -07:00
Eric Davis 62cdfd35de [#6441] Refactor: only call validation on updates 2011-08-09 15:34:53 -07:00
Eric Davis 5c1e254181 [#6441] Remove test code that is now in a setup block 2011-08-09 15:24:58 -07:00
Eric Davis 0a916fea70 [#6441] Fix a Deliverable validation error when editing with a status change 2011-08-09 15:23:08 -07:00
Eric Davis ac24ae08e6 [#6441] Block editing Locked or Closed Deliverables. 2011-08-08 15:52:13 -07:00
Eric Davis 51f62ca5a3 [#6441] Block assigning issues to a locked or closed Deliverable 2011-08-08 15:14:22 -07:00
Eric Davis 07c3c42ca8 [#6441] Refactor logic in view to helpers 2011-08-08 14:12:06 -07:00
Eric Davis 953587ce46 [#6441] Block logging time on closed contracts or deliverables 2011-08-08 13:46:28 -07:00
Eric Davis 5e2e309304 [#6441] Add a manual Deliverable#status 2011-08-08 12:08:46 -07:00
Eric Davis 9453b52c10 [#6441] Add a manual Contract#status 2011-08-08 11:48:35 -07:00
Eric Davis fbd38b3678 Fix tests due to core changes 2011-08-08 10:32:04 -07:00
Eric Davis 4ade8de2c4 Add Gemfile for ChiliProject 2011-07-30 21:57:04 -07:00
Eric Davis 2153220675 Merge branch '5482-issue-grouping' 2011-02-22 10:58:39 -08:00
Eric Davis 496c6bada7 [#5482] Fix counts when grouping by contracts in the issues list 2011-02-22 10:58:19 -08:00
Eric Davis 3384dd3dbd Refactor: merge assertions in tests 2011-02-22 10:35:32 -08:00
Eric Davis 7d7d6da8b5 [#5482] Add tests for the grouping counts 2011-02-22 10:34:42 -08:00
Eric Davis 96fa509a1e [#5482] Change deliverable QueryColumn so the grouped counts are shown 2011-02-22 10:11:04 -08:00
Eric Davis a0b92851a7 [#5482] Add issue grouping by contract 2011-02-22 09:41:15 -08:00
Eric Davis d2aa87fdd2 [#5482] Add issue grouping by deliverable 2011-02-22 09:10:15 -08:00
Eric Davis f514b15361 Added some comments to make the source easier to scan 2011-02-17 11:47:59 -08:00
Eric Davis 889a825426 [#5442] Add rdocs to Contract to make it easier to understand next time 2011-02-17 11:44:28 -08:00
Eric Davis a92559c133 [#5442] Add contract totals for labor and overhead hours spent and budgeted 2011-02-17 11:30:40 -08:00
Eric Davis af0eecb6dc [#5421] Only bulk assign deliverables to issues when the user has permission 2011-02-08 10:02:07 -08:00
Eric Davis 70fad4d8e2 [#5421] Only assign the issue deliverable when a user has permission. 2011-02-08 09:43:02 -08:00
Eric Davis ff363f08f3 [#5421] Add Assign Deliverable to Issue permission for the issue bulk edit form 2011-02-08 09:29:54 -08:00
Eric Davis 40fc6e9751 [#5421] Add Assign Deliverable to Issue permission for the new/edit issue form 2011-02-08 09:25:37 -08:00
Eric Davis 75680e5a49 [#5417] Show the deliverable type on the edit form. 2011-02-04 09:45:27 -08:00
Eric Davis 39073905c3 Remove typo, extra quotes 2010-12-04 11:09:29 -08:00
Eric Davis abeba76f40 [#4803] Reload the Journal details when showing the deliverable name 
This caused an odd bug that occurred in Postgres. What would happen is that
the first call would find the Deliverable correctly and set the value/old_value
on the Journal.  But on the second call, the Journal would have the Deliverable
subjects in the value and old_value (as string), which would cause Postgres to
error since it won't allow searching id (int) with the subject (string).

MySQL and SQLite worked because the finder would run but return nil and the next
statements are guarded against nils.
 2010-12-04 11:00:58 -08:00
Eric Davis 726c7a206f [#4690] Clear the issue/deliverable relation when deleting deliverables 2010-10-27 14:29:50 -07:00
Eric Davis 6f1ce637c5 Update the error template for the latest Redmine 2010-10-27 14:29:11 -07:00
Eric Davis bef015f4ea [#4674] Round calculated Overhead Budget hours to two places 2010-10-21 11:10:13 -07:00
Eric Davis b74ed932db [#4673] Handle edge cases parameters from rake 2010-10-21 11:09:48 -07:00
Eric Davis 2957d8e2cc [#4674] Add an option for an overhead rate which computes overhead hours 2010-10-21 10:30:28 -07:00
Eric Davis a302c17b04 [#4673] Add an option to remove the converted data from deliverables 2010-10-21 09:50:46 -07:00
Eric Davis 1fafe8ea92 [#4653] Don't show a $ when a value field is blank 2010-10-14 15:35:33 -07:00
Eric Davis 2aea176df0 [#4650] Added labels to the Fixed Budget form 2010-10-14 13:05:02 -07:00
Eric Davis 5a0cb948c9 [#4649] Change the flash message to say deleted and not destroyed 2010-10-14 12:46:10 -07:00