Commit Graph
100 Commits
Author SHA1 Message Date
Eric Davis cb8fd95f29 [#4178] Fixed a JS syntax error from the skinning. 2010-08-09 12:34:42 -07:00
Eric Davis 074d6a47e7 [#4178] Fixing integration tests based on the UI changes. 2010-08-09 12:29:04 -07:00
Eric Davis de0752ed02 [#4178] CSS stripe the contracts list. 2010-08-09 12:00:38 -07:00
Eric Davis ed1d04d18d [#4178] Fix a css rule that leaked into the table cell title. 2010-08-09 12:00:20 -07:00
Eric Davis 0cb4b1941a Removed extra TODO, migration process was decided. 2010-08-09 11:50:14 -07:00
Eric Davis 66f3a07e75 [#4178] TODO flagging sections of the views with their release version. 2010-08-09 11:49:42 -07:00
Eric Davis 4af0860542 [#4178] Zebra stripe deliverable table. 2010-08-09 11:34:36 -07:00
Eric Davis 118b0d7622 [#4178] Fix a width issue in the contract terms in Chrome webkit. 2010-08-09 11:28:59 -07:00
Eric Davis 74795a2788 Untabify 2010-08-09 11:16:15 -07:00
Eric Davis a2dfc1c92b [#4178] Removed emtpy table cells that are for future features. 2010-08-09 11:16:00 -07:00
Eric Davis 67069dc60a [#4178] Tweak the Deliverable Finances so it's one table per child record. 2010-08-09 11:12:51 -07:00
Eric Davis 90d2aeccea [#4178] Added styles for the Deliverable form. 2010-08-09 11:07:55 -07:00
Eric Davis 78c43a8821 [#4178] Added Contract title bar to the deliverable form. 2010-08-09 10:37:00 -07:00
Eric Davis 73e92d2970 [#4178] Extract contract title bar to partial. 2010-08-09 10:33:29 -07:00
Eric Davis c652360a6d [#4178] Fixed the Contract form's submit button layout. 2010-08-09 10:24:46 -07:00
Eric Davis 5958285410 [#4178] Updated the Contract form from the design. 2010-08-03 15:17:50 -07:00
Eric Davis fcf012c828 [#4178] First port of the Contracts#show skin. 2010-08-03 14:58:08 -07:00
Eric Davis fe2c058def [#4178] Skinned Contracts#list. 2010-08-03 13:23:51 -07:00
Eric Davis ea00b89af5 [#4178] Adding JS and CSS assets. 2010-08-03 13:12:20 -07:00
Eric Davis 84c679dc67 [#4327] Show the deliverable's title in the Journal notes. 2010-08-03 12:02:37 -07:00
Eric Davis 848616853d [#4327] Save deliverable bulk edits. 2010-08-03 11:38:17 -07:00
Eric Davis 72aeaac59a [#4327] Added the Deliverable field to the bulk edit. 2010-08-03 11:24:23 -07:00
Eric Davis 6ad50c57b2 [#4184] Add a compatibility wrapper for Deliverable#due 2010-08-03 10:48:17 -07:00
Eric Davis 1d644178bd [#4184] Fix the issue mapper so each issue is migrated only once. 2010-08-03 10:17:57 -07:00
Eric Davis 389fbf3d13 [#4327] Save the deliverable changes to the issue using the hooks. 2010-08-02 16:36:14 -07:00
Eric Davis 729acf200d [#4327] Add a select field to selecting the deliverable for an issue. 2010-08-02 16:07:59 -07:00
Eric Davis ad8dec8638 [#4327] Show the current deliverable on the issue details page. 2010-08-02 15:14:05 -07:00
Eric Davis 39edad3e07 Fix broken test. 2010-08-02 13:39:07 -07:00
Eric Davis 76a0573341 [#4281] Change the title for editing a contract. 2010-07-19 17:45:44 -07:00
Eric Davis 231066098b [#4281] Change the title for editing a Deliverable. 2010-07-19 17:44:41 -07:00
Eric Davis 7209871e87 [#4280] Add the $ as a hint to the Deliverable total form. 2010-07-19 17:39:35 -07:00
Eric Davis 1670fb5a73 [#4279] Move the total field to the bottom of the deliverable form. 2010-07-19 17:36:59 -07:00
Eric Davis 4100972d46 [#4278] Increase the size of the Contract's small wiki fields. 2010-07-19 17:33:55 -07:00
Eric Davis e4ce899cd5 Sort deliverable managers in the select field. 2010-07-19 17:31:05 -07:00
Eric Davis c8ede6a05d [#4277] Only show project members for account executives. 2010-07-19 17:30:51 -07:00
Eric Davis 0b0977a492 Fixed a test that was shadowed by another. 2010-07-19 10:41:57 -07:00
Eric Davis 06e3f8d39a [#4184] Use a mapper to track primary key differences on Deliverables. 2010-07-19 10:39:40 -07:00
Eric Davis 279ed4c206 [#4184] An Issue belongs to a Deliverable. 2010-07-19 10:30:37 -07:00
Eric Davis cb3fe1a18f [#4184] Fix test. 2010-07-19 10:24:50 -07:00
Eric Davis f668d55552 [#4184] Enable the contracts module for projects in the conversion. 2010-07-19 10:06:04 -07:00
Eric Davis d08d3ccc52 [#4184] Default some required values. 2010-07-19 09:54:49 -07:00
Eric Davis e2aabeec8c [#4184] Load the YAML inside of #migrate. 2010-07-19 09:54:25 -07:00
Eric Davis 0ac27c0d3b [#4184] Export old Deliverable data. 2010-07-19 09:13:04 -07:00
Eric Davis 22191b99d1 Refactor: extract method. 2010-07-19 08:48:19 -07:00
Eric Davis 79ead02f7a Refactor: extract method. 2010-07-19 08:47:01 -07:00
Eric Davis 35c40553cd Refactor: extract method. 2010-07-19 08:44:59 -07:00
Eric Davis 40ca03d7aa Refactor: inline setting attributes. 2010-07-19 08:42:29 -07:00
Eric Davis 435a75d2c7 Refactor: extract method. 2010-07-19 08:41:25 -07:00
Eric Davis 4f9ee03fb5 [#4184] Convert materials and materials % to OverheadBudgets. 2010-07-19 08:35:12 -07:00
Eric Davis d934f39021 [#4184] Automatically rename the Budget's Deliverables table. 2010-07-14 13:20:14 -07:00
Eric Davis f6854ccb0a [#4184] Make sure that all migrations are run before converting. 2010-07-14 11:03:21 -07:00
Eric Davis ad4b3e542b [#4184] Added check to make sure the budget plugin is not installed. 2010-07-14 10:58:08 -07:00
Eric Davis 7d9f45d2ed [#4184] Append the YAML object dump to the notes. 2010-07-14 10:37:32 -07:00
Eric Davis e6ab8ac3ab [#4184] Converted Labor Budget for HourlyDeliverables. 2010-07-14 10:30:40 -07:00
Eric Davis 70d57ee359 [#4184] Refactor duplication. 2010-07-14 10:24:03 -07:00
Eric Davis f0eb4812b5 [#4184] Convert overhead percents. 2010-07-14 10:19:04 -07:00
Eric Davis 7865ee69ea [#4184] Convert overhead values. 2010-07-14 10:11:36 -07:00
Eric Davis acf6e5e9b4 [#4184] Convert FixedDeliverable#total. 2010-07-14 10:05:36 -07:00
Eric Davis a7d61d6e36 Merge branch 'master' into local/4184-budget-migration 2010-07-14 09:59:21 -07:00
Eric Davis 41e221119c [#4183] Implemented Contract#profit_left. 2010-07-13 18:32:35 -07:00
Eric Davis 361b971100 [#4183] Implemented Contract#total_spent 2010-07-13 18:25:00 -07:00
Eric Davis 850d6adb54 [#4183] Updated contract tests from the Deliverable calculation changes. 2010-07-13 18:19:58 -07:00
Eric Davis 1f22b203b6 [#4183] Implemented HourlyDeliverable#profit_left. 2010-07-13 18:15:29 -07:00
Eric Davis cd3ba5e5e5 [#4183] Implemented HourlyDeliverable#total_spent. 2010-07-13 18:11:02 -07:00
Eric Davis 597062fdf8 [#4183] Implemented FixedDeliverable#profit_left (was called profit_spent). 2010-07-13 18:00:35 -07:00
Eric Davis de42a32121 [#4183] Implemented FixedDeliverable#total_spent 2010-07-13 17:49:50 -07:00
Eric Davis 5d09a035c5 [#4183] Updated HourlyDeliverable#profit_budget test to match the example. 2010-07-13 17:43:00 -07:00
Eric Davis 80cde2d222 [#4183] HourlyDeliverable#total (budget) should only include labor budget. 2010-07-13 17:38:49 -07:00
Eric Davis 5c01a0709d [#4184] Got the most basic objects ported from Budget to Contracts. 2010-07-13 14:58:11 -07:00
Eric Davis b787d4adbe [#4184] Test refactoring. 2010-07-13 14:36:06 -07:00
Eric Davis 30172b4be1 [#4184] Starting on the budget data migration. 2010-07-13 14:35:23 -07:00
Eric Davis d8196842ff [#4186] Added the Total Budget to the Contract list view. 2010-07-13 13:41:25 -07:00
Eric Davis 9c07ee676e [#4183] Implemented Contract#labor_spent. 2010-07-13 13:31:28 -07:00
Eric Davis 7323537ea6 [#4183] Implemented Contract#overhead_spent. 2010-07-13 13:27:06 -07:00
Eric Davis a9bae2e604 [#4183] Update the estimated hours field. 2010-07-13 11:45:47 -07:00
Eric Davis 6dcad41646 Refactor: remove hard coded formatter in #show_budget_field. 2010-07-13 11:42:00 -07:00
Eric Davis a1a66146ee Refactor: merge methods by using a block to control custom data. 2010-07-13 11:39:55 -07:00
Eric Davis b24ab65792 [#4183] Implemented Contract#estimated_hour_spent and Deliverable#hours_spent_total. 2010-07-13 11:34:22 -07:00
Eric Davis af99dc4042 [#4183] Format the payment terms using the translated string. 2010-07-13 11:18:26 -07:00
Eric Davis 96d75a149c [#4183] Bold the labels on the contract details so the fields are easier to see. 2010-07-13 11:14:07 -07:00
Eric Davis 9f4fec3fd2 [#4183] Format wiki fields. 2010-07-13 11:09:37 -07:00
Eric Davis e19a1e192f [#4183] Small UI tweaks until skinning. 2010-07-13 11:01:58 -07:00
Eric Davis 8139c952b5 Shrink some of the contract's wiki edits to 3 rows, per specs. 2010-07-13 10:48:30 -07:00
Eric Davis f83555a4b0 [#4183] Added client point of contact for a Contract. 2010-07-13 10:47:37 -07:00
Eric Davis 93498d31b2 [#4183] Split TODO columns by this release and later release. 2010-07-13 10:39:39 -07:00
Eric Davis 4d475042f0 [#4183] Implemented Contract#profit_budget and Deliverable#profit_budget. 2010-07-13 10:28:45 -07:00
Eric Davis f89e0bf14a [#4183] Implemented Contract#total_budget. 2010-07-07 16:01:47 -07:00
Eric Davis 91b16a2310 [#4183] Updated HourlyDeliverable#total to calculate the estimated total 2010-07-07 16:00:40 -07:00
Eric Davis 26aac777e4 [#4183] Implemented Contract#estimated_hour_budget 2010-07-07 15:25:21 -07:00
Eric Davis e48045ab77 [#4183] Implemented Contract#overhead_budget 2010-07-07 15:21:23 -07:00
Eric Davis 4703583a50 [#4183] Implemented Contract#labor_budget 2010-07-07 15:19:46 -07:00
Eric Davis 3d4e71ff93 [#4183] Show budget fields on a single line: one for spent, one for budget. 2010-07-07 15:10:23 -07:00
Eric Davis 44664edf30 [#4183] Add all the fields for the Contract metadata with TODOs. 2010-07-07 14:57:05 -07:00
Eric Davis e199c77bae [#4182] Style the labor and overhead sections of the table a bit. 2010-07-07 13:48:43 -07:00
Eric Davis 5cc66ddb09 [#4182] Display the Labor and Overhead spent on the Contract page. 2010-07-07 13:46:00 -07:00
Eric Davis b9e68cd52c [#4182] Added test for Deliverable#overhead_spent integration. 2010-07-07 13:29:20 -07:00
Eric Davis 9da37a6cfd [#4182] Refactor duplicated test setup to helper. 2010-07-07 13:26:50 -07:00
Eric Davis b8edb5b4fc [#4182] Setup and tested HoulyDeliverable's redmine_overhead integration. 2010-07-07 13:23:59 -07:00
Eric Davis 84f9b895b7 [#4182] Setup and tested FixedDeliverable's redmine_overhead integration. 2010-07-07 13:22:35 -07:00
Eric Davis 897a6e2aa2 [#4182] Testing and fixing patches from the Overhead plugin to Deliverables. 2010-07-07 12:50:48 -07:00