Commit Graph

269 Commits

Author SHA1 Message Date
Paul van Tilburg d4b75e1e04 Fix the Create new invoice button 2015-06-20 18:27:33 +02:00
Paul van Tilburg 69faada059 Follow Bootstrap in using em and strong instead of i and b 2015-06-20 18:26:49 +02:00
Paul van Tilburg 96435e3d86 Fix text class 2015-06-20 18:25:24 +02:00
Paul van Tilburg 67d0b60a9f Add an _icon helper method; add icons to almost all buttons 2015-06-20 18:24:19 +02:00
Paul van Tilburg e43821dc69 Remove fixed column widths to improve responsiveness of tables 2015-06-20 18:22:44 +02:00
Paul van Tilburg 118499396a Rework all views to work with Boostrap 3
* Add responsiveness to tables (use col-xs* and hidden-xs where needed) and
  use the grid system
* Update al inline and horizontal forms (add extra options to the
  form helper methods)
* Replace the accordion by collapsing panels in the task form
* Update buttons and alerts
* Update the navbar in the main layout
2015-06-20 18:16:31 +02:00
Paul van Tilburg 17cad0d0ba Enable responsiveness; drop/remove the unused Bootstrap theme 2015-06-20 17:59:47 +02:00
Paul van Tilburg ca9e889e84 Update the Bootstrap file links in the main layout 2015-06-19 22:25:38 +02:00
Paul van Tilburg a97a305f6c Bump version to 1.14.0 2015-06-19 22:08:08 +02:00
Paul van Tilburg a744a4f0d1 Add a grand total of unbilled hours and amount to the overview view 2015-06-19 22:02:13 +02:00
Paul van Tilburg 55e18615e4 Hook up a customer-specific time entries list in the customer form view 2015-06-19 21:41:22 +02:00
Paul van Tilburg 7a1d18269a Turn the time entries view into a partial view; create timeline view
Adapt the task form view to use the time entries partial view as well.
2015-06-19 21:39:36 +02:00
Paul van Tilburg 90b0df148e Merge branch 'release/1.12.1' 2015-06-06 12:27:47 +02:00
Paul van Tilburg 4eaf0cb58a Bump version to 1.12.1 2015-06-06 12:26:36 +02:00
Paul van Tilburg 656867e044 Add a footer (with version) 2015-06-06 12:26:16 +02:00
Paul van Tilburg 9928fc6f2a Bump version to 1.12 2015-06-05 22:36:00 +02:00
Paul van Tilburg ac551fcf7a Add helper method for LaTeX-escaping strings in ERB 2015-06-05 22:26:59 +02:00
Paul van Tilburg 4cf1517b43 Show message if there are tasks but no active tasks
Show links to the task form of each of these tasks so that time can be
registered there.
2014-11-08 12:06:34 +01:00
Paul van Tilburg 2e5985b32b Discern customer tasks and active tasks 2014-11-08 12:06:19 +01:00
Paul van Tilburg 730736a84a Bump version to 1.10 2014-11-01 22:10:45 +01:00
Paul van Tilburg 38c8d7dd17 Only select time entries that are not in the current month 2014-11-01 22:09:44 +01:00
Paul van Tilburg d613a095e1 Add in_current_month? method to the TimeEntry model 2014-11-01 22:09:21 +01:00
Paul van Tilburg 68c6a337a1 Show only active tasks in the invoice select form
If there are tasks with an hourly rate that have no time entries,
then it's not worth showing them.
2014-11-01 22:08:16 +01:00
Paul van Tilburg 58f5e4bbe6 Rework all documentation in YARD format 2014-11-01 21:37:41 +01:00
Paul van Tilburg 49eb58ff51 Build a span per customer so that they flow and use two columns in the overview 2014-11-01 17:47:52 +01:00
Paul van Tilburg 35462ed0dd Show a total of unbilled time and earned money (excl. VAT) per customer 2014-11-01 17:47:13 +01:00
Paul van Tilburg d1ac6ff979 Show only active tasks in the overview view
Active tasks are unbilled tasks that are tasks that are either fixed cost
or that have time entries that should be billed.
2014-11-01 17:45:16 +01:00
Paul van Tilburg 03ca8b6d47 Bump version to 1.8 2014-10-31 22:06:41 +01:00
Paul van Tilburg 46409502fb Merge branch 'feature/4235ef-force-invoice-regeneration' into development (closes: #4235ef) 2014-10-31 21:59:34 +01:00
Paul van Tilburg 371ec2c81a Handle delete requests for invoices 2014-10-31 21:59:17 +01:00
Paul van Tilburg 236729be6c Check and show a delete button if an invoice file is present 2014-10-31 21:55:04 +01:00
Paul van Tilburg b94d5ccff2 Fix invoice period calculation
Currently, the end time of the period was always the creation time of
the invoice (due to the initialisation), as it is generally by definition
later than any of the task periods.
2014-10-28 10:02:13 +01:00
Paul van Tilburg 8d8eba1e18 Documentation fix 2014-10-25 22:33:05 +02:00
Paul van Tilburg 60230c5854 Fixed bug preventing updates tasks 2014-10-25 22:32:57 +02:00
Paul van Tilburg b12d78bdb2 Round start and end time before validation (and thus saving)
I've chosen to connect the callback to before_validation because
at a later point we want to check for overlap between time entries
and this should be done using the corrected versions.
2014-10-25 21:55:23 +02:00
Paul van Tilburg 26862ed2ef Add private method for the TimeEntry model to round time
The method uses the configuration to determine the resolution and is
inspired by the following StackOverflow answer:
https://stackoverflow.com/a/4182700.
2014-10-25 21:53:33 +02:00
Paul van Tilburg b182711f39 Add configuration for time resolution rounding 2014-10-25 21:35:53 +02:00
Paul van Tilburg 423916232f Show time specification of projects/task the invoice_form
They are inserted in the titles of the time entry links so they are
shown when hovering over them.

Also fixed "None" not being displayed when there was no time entry
comment.
2014-10-25 18:31:50 +02:00
Paul van Tilburg 6cfdd4c7e1 Spacing and label fixes 2014-10-25 18:31:08 +02:00
Paul van Tilburg 4bb47f7504 Add jump buttons for customer and project/task in time_entry view 2014-10-25 18:30:50 +02:00
Paul van Tilburg a50c4e330f Add a "Create a new invoice" button per customer
This is done similarly as in the customer_form view.
2014-10-25 18:04:18 +02:00
Paul van Tilburg da8db07e94 Make key of customer/invoice mapping a customer
The key was the customer name before, but then it's not possible
to use any other information of the customer model anymore.
2014-10-25 18:02:37 +02:00
Paul van Tilburg f32c6da1d4 Add a VERSION constant and print it on start 2014-10-19 21:37:20 +02:00
Paul van Tilburg e5e879df03 Style the no customer/invoices/projects alerts the same way 2014-10-18 21:28:18 +02:00
Paul van Tilburg 70588df53f Fix missing doctype in main layout 2014-10-18 21:27:46 +02:00
Paul van Tilburg d5b5e0e4e0 Fix column cache being out-of-sync after migration 2014-10-18 21:27:26 +02:00
Paul van Tilburg 507010172f Fix payed→payed column rename migration 2014-10-18 21:26:55 +02:00
Paul van Tilburg b7de738866 Fix broken migration that cannot access config 2014-10-18 21:26:14 +02:00
Paul van Tilburg 21091e914e Fix broken period calculation initialisation 2014-10-18 21:25:51 +02:00
Paul van Tilburg 3e1ed8af58 Make ActiveRecord query calls compatible with AR4 2014-10-18 21:25:26 +02:00