Commit Graph
100 Commits
Author SHA1 Message Date
Lukas Halbritter b669cab4a7 Minor checkstyle fix. 2018-10-10 17:31:46 +02:00
Lukas Halbritter b147c4f9f9 Added option to create a new person target together with a new booking 2018-10-10 17:31:09 +02:00
Lukas Halbritter b4480486e9 Added a validator that checks, if a values is empty, if another one is set. 2018-10-10 17:28:59 +02:00
Lukas Halbritter 5b2e5f5fb9 The formatDate() helper method now returns an empty strin, if the input date is
null. As yet it returned the current date.
2018-10-10 15:03:29 +02:00
Lukas Halbritter 960e1b0e16 Removed unnecessary column in bookings.index. 2018-10-08 11:16:51 +02:00
Lukas Halbritter 4e601b964f Implemented projects. 2018-10-08 11:14:47 +02:00
Lukas Halbritter bcdf167b82 Fixed issue with indented balance rows in the bookings index. 2018-10-05 23:02:53 +02:00
Lukas Halbritter 108fc07cdb The formatAmount shows no longer an absolute ammount when in text mode. 2018-10-05 19:39:35 +02:00
Lukas Halbritter 8ed668cacc Fixed minor codestyle issue. 2018-10-05 19:39:18 +02:00
Lukas Halbritter f58b193c4e Implemented deletion of bookings. 2018-10-05 19:38:47 +02:00
Lukas Halbritter 72252ab2c6 Added error messages to the booking create form. 2018-10-05 17:18:06 +02:00
Lukas Halbritter 14fe861c35 Simplyfied the array structure of the form values and added error messages. 2018-10-05 17:17:15 +02:00
Lukas Halbritter f028932fdf Added linkt so the edit form of the bookings. 2018-10-05 17:15:48 +02:00
Lukas Halbritter 75d6568dac Implemented bookings update method.
Fixed some code stlye issues as well as some issues with referencing null.
2018-10-05 17:13:30 +02:00
Lukas Halbritter cde98630a1 Added validation logic for booking store and update. 2018-10-05 17:11:55 +02:00
Lukas Halbritter 5b1be136ad Added helper method to check, if an array has only null-values. 2018-10-05 17:11:06 +02:00
Lukas Halbritter ac49d3857f Transferred the loading of the arrays for the booking forms into a own separate
method.
Impemented the booking.edit view and controller method.
Fixed the bug in the bookings.index view that only months with cashflow are
listed.
2018-10-04 23:10:58 +02:00
Lukas Halbritter 20859fe4a9 Transferred the loading of the arrays for the booking forms into a own separate
method.
Impemented the booking.edit view and controller method.
2018-10-04 22:59:41 +02:00
Lukas Halbritter e5386fe7e7 Added view for creating a new booking. 2018-10-04 20:38:02 +02:00
Lukas Halbritter e6ef75e59d Made some minor style changes and removed unused links in the main menu. 2018-10-04 20:37:15 +02:00
Lukas Halbritter 0907b18671 Added methods to get the person that belongs to a target and a method to get all
targets which are nichot paid.
2018-10-04 20:35:39 +02:00
Lukas Halbritter 1e9e90ec17 The fullName() method is now able to return the name, but in the form 'LAST
NAME, FIRST NAME'.
2018-10-04 20:34:26 +02:00
Lukas Halbritter 201ffd3d7a Added a method to replace every ',' in a string with a '.'. 2018-10-04 20:32:46 +02:00
Lukas Halbritter bfe50dec65 Implemented the create method of the BookingsController and fixed some code
style issues.
2018-10-04 20:30:20 +02:00
Lukas Halbritter 9032793597 Added method to get the PersonTarget of a Booking. 2018-10-04 19:56:31 +02:00
Lukas Halbritter fe9cb367e5 Added a method to get the scope of an accountClass. 2018-10-04 19:55:52 +02:00
Lukas Halbritter f8eb022403 Added AccountType method numberAndName().
Fixed bug in bookings.index view: There is no error anymore when a booking has
no project assigned.
2018-10-04 19:53:59 +02:00
Lukas Halbritter e80481f860 The views bookings.index and people.show now use the formatDate and formatAmount
helpers.
2018-10-01 17:20:19 +02:00
Lukas Halbritter 1de0126663 Set all date inputs in person form to be actually date type inputs. 2018-10-01 17:18:47 +02:00
Lukas Halbritter cc203f36c7 Added some helpers for date string formatting. 2018-10-01 17:17:41 +02:00
Lukas Halbritter e9077193af Implemented eager loading for the people show view. 2018-10-01 09:58:04 +02:00
Lukas Halbritter 8f865e9bff Added helper methods for first and last day of month.
Sub-bookings are now showed in the bookings index view.
2018-10-01 09:56:55 +02:00
Lukas Halbritter 491a6f6153 Added iSeed generator to generate a seeder from the current database content.
See: https://github.com/orangehill/iseed
2018-09-30 21:50:04 +02:00
Lukas Halbritter 3f6fe26ff0 Optimized (sub-)booking methods and index view for eager loading. 2018-09-30 21:38:25 +02:00
Lukas Halbritter 07ec0482a0 Updated composer: Added laravel debug bar. 2018-09-29 09:58:27 +02:00
Lukas Halbritter 7c7c986f24 Set form input type of the date of birth field to 'date'. 2018-09-28 22:48:35 +02:00
Lukas Halbritter cc95c4b595 Added bookings controller and index view. 2018-09-28 22:47:35 +02:00
Lukas Halbritter 3b09645b5b Added the functions to get the models connected with the booking. 2018-09-28 22:45:32 +02:00
Lukas Halbritter e29381c0ec Removed an unnecessary line break. 2018-09-28 22:44:36 +02:00
Lukas Halbritter 4566441d8c The SubBooking factory now uses the abs() function to generate values, since
amount is an absolute value and the sign is stored as property of the i_o_type.
2018-09-28 22:42:51 +02:00
Lukas Halbritter 2ecf78c53d Added routes for the booking pages. 2018-09-28 22:41:57 +02:00
Lukas Halbritter 530ced47b2 Added the following functions to SubBooking:
Query scopes:
    interval($start, $end)
    joinBookings()
    withSignedAmount()
    joinAccountBranch()
  Sum functions:
    balanceAt($date)
    expedituresInInterval($start, $end, $group)
    incomesInInterval($start, $end, $group)
    cashFlowInInterval($start, $end, $type, $group)
2018-09-28 22:37:53 +02:00
Lukas Halbritter a8aa43e28c Swapped order in use directives. 2018-09-28 22:36:41 +02:00
Lukas Halbritter eb4e15670d Made some layout changes:
1. Added loading time message as footer.
2. Added pollux logo as header.
3. Added bookings link in the main menu.
4. Set font type to sans serif.
2018-09-28 22:32:40 +02:00
Lukas Halbritter e00e15ef62 Member state in the PeopeController update method is initialized as new model,
if there is no corresponding member state in the database.
2018-09-26 10:40:00 +02:00
Lukas Halbritter 8512dc28b6 Added title to the people.show view. 2018-09-26 10:38:06 +02:00
Lukas Halbritter 377230ef73 Implemented deletion and creation of people. 2018-09-25 15:24:31 +02:00
Lukas Halbritter 494c5cf47c Set the foreign key person_targets->person_id from 'on delete restrict' to 'on
delete cascade', since it should be possible to delete a person which is even
and has paid all debts.

Before showing the delete confirmation dialog, it is checked, if there is any
open target.
2018-09-25 15:20:19 +02:00
Lukas Halbritter 1982ee0260 Removed method field from person edit file.
The method is automatically fetched in the layout.form.person file by checking,
if $person->id is null.
2018-09-25 15:17:52 +02:00
Lukas Halbritter bacb3a2738 Added subnav section in master layout. 2018-09-25 15:17:32 +02:00
Lukas Halbritter 39f0ca3c1c Fixed some issues in the person form:
1. Added csrf field.
2. Added dropdown menue for the title.
3. Added an input for the date of birth.
4. Fixed the appearance of the member state edit section.
2018-09-25 15:11:25 +02:00
Lukas Halbritter d71ceb1c77 Added delete link in the people index. 2018-09-25 15:10:12 +02:00
Lukas Halbritter eef1ecca6b Embedded people show view into the master layout. 2018-09-25 15:09:26 +02:00
Lukas Halbritter 89a86771b4 Made Person mass assignable.
Added an isEven() function to check, if the person has any open targets.
2018-09-25 15:07:33 +02:00
Lukas Halbritter 110c82c376 Run composer update. 2018-09-25 15:07:01 +02:00
Lukas Halbritter 0be3623fb3 Re-sorted routes to avoid an 'page not found error'.
The /people/create route was covered by the /people/{person} route. Since 'create' was assumed to be an person id, the page was not found.
2018-09-25 15:05:03 +02:00
Lukas Halbritter 81cc32db29 Added a layout for the people create/edit form.
Implemented the edit view for people.
2018-09-24 18:54:34 +02:00
Lukas Halbritter 9f11eddc79 Added the link to edit people in the people index view. 2018-09-24 18:53:19 +02:00
Lukas Halbritter c3ea32f228 Added all prototypes to the PeopleController.
NOT ALL OF THEM ARE IMPLEMENTED, YET!
2018-09-24 18:51:49 +02:00
Lukas Halbritter f86ce156f9 Added all routes for the people. 2018-09-24 18:50:29 +02:00
Lukas Halbritter f201a98e6e Added the Form and HTML package by the Laravel Collective. 2018-09-24 18:49:24 +02:00
Lukas Halbritter c82cc4ed2d Added a very basic layout structure. 2018-09-24 14:08:08 +02:00
Lukas Halbritter ecd815e182 The account of a person now shows the sub-bookings which belong to a target. 2018-09-20 16:49:33 +02:00
Lukas Halbritter b38d7ea54e Added factory and seeder for sub-bookings. 2018-09-20 16:48:56 +02:00
Lukas Halbritter c9bc400308 Added isPaid() method to PersonTarget model. 2018-09-20 16:48:16 +02:00
Lukas Halbritter c8fcb4c959 Added AccountType methods to get all types which are expediture or income. 2018-09-20 16:45:00 +02:00
Lukas Halbritter f2a12d40d7 Added a signedAmount() function to the SubBooking model. 2018-09-19 22:25:18 +02:00
Lukas Halbritter 020c1c50d8 Added a bunch of new functions to the PersonTarget model, mainly to get filtered
model collections from the database.
2018-09-19 22:22:54 +02:00
Lukas Halbritter ac080eb485 Added some basic methods to the models to get roperties from related models or
the related models themselfes.
2018-09-14 11:27:08 +02:00
Lukas Halbritter 11775170d6 Fixed typo 2018-09-14 11:26:44 +02:00
Lukas Halbritter 204e7527bd Added seeders for members-states and person targets. 2018-09-14 09:53:01 +02:00
Lukas Halbritter ed702a0398 Added member state section to the people.show view.
Updated account section of the same view.
2018-09-13 16:27:20 +02:00
Lukas Halbritter f394ed773b Changed foreign key id field name in person_targets and account_classes from
'io_type' to 'io_type_id'.

Implemented PersonTarget factory.
2018-09-13 16:04:40 +02:00
Lukas Halbritter 47569b0525 Adde 'fullName' method to the Person model to achieve the full name as string. 2018-09-13 15:57:40 +02:00
Lukas Halbritter 1b10f45a7d Added helper function 'formatAmount' to auto format floats top german format. 2018-09-13 15:55:42 +02:00
Lukas Halbritter 562cbe6b9a Merge branch 'people' of ssh://halbi.ddnss.de:2122/media/raid/repositories/pollux into people 2018-09-12 11:57:23 +02:00
Lukas Halbritter b66aaa9566 Added some seeders. 2018-09-12 11:57:04 +02:00
Lukas Halbritter 15c32209b2 Added model factories for the remaining models. 2018-09-12 11:56:28 +02:00
Lukas Halbritter fcc59f16ae Added helper function file and updated composer.json accordingly. 2018-09-12 11:07:42 +02:00
Lukas Halbritter 6ff2da68ed The PersonFactory is now using factory states to decide if male, female or
company.
2018-09-12 10:23:09 +02:00
Lukas Halbritter da2dfc1701 Commented out the member states section in the people table seeder to please
Adrian ;-)
2018-09-11 21:30:09 +02:00
Lukas Halbritter 1a71c405fb Added empty MemberState factory.
Don't forget to use states in the Person factory.
2018-09-11 18:30:45 +02:00
Lukas Halbritter c8c9f528f0 Updated ER-model pdf. 2018-09-11 18:10:31 +02:00
Lukas Halbritter 5ec117e1af Changed functions in Person model such that they return a Relation instead of an
Eloquent collection and adjusted the PersonController accordingly.
2018-09-11 17:11:46 +02:00
Lukas Halbritter 003ff1435a Added person factory.
Fixed missing comma in TestProjectsTableSeeder.
2018-09-11 15:51:45 +02:00
Lukas Halbritter cb653c795a Edited fields of people table in the ER-diagram. 2018-09-11 15:47:41 +02:00
Lukas Halbritter 1f44202faf Added seeds for projects table. 2018-09-11 11:40:17 +02:00
Lukas Halbritter 9d55db30e7 Fixed some typos in the database concept (mainly wrong table names). 2018-09-11 11:07:16 +02:00
Lukas Halbritter f59ee5247a Added some test persons and member-states to the seeders. 2018-09-11 11:04:57 +02:00
Lukas Halbritter 3860b5b187 Fixed typo. 2018-09-11 10:55:58 +02:00
Lukas Halbritter cceec0a6bb Completed seeder for the account types table. 2018-09-11 10:53:06 +02:00
Lukas Halbritter 276e617b62 Added seeder for account types and account classes. 2018-09-10 12:33:20 +02:00
Lukas Halbritter 5bdb4bf502 Changed scope column name to scope_id in table account_classes. 2018-09-10 12:01:19 +02:00
Lukas Halbritter 965d40c178 Added number column to account classes table. 2018-09-10 11:59:33 +02:00
Lukas Halbritter 7008b54f2c Added seeders and seeder folder structure. 2018-09-10 11:36:51 +02:00
Lukas Halbritter dd184c227f Changed io_type to i_o_type in the foreign key definitions of person targets
and account classes.
2018-09-09 11:55:56 +02:00
Lukas Halbritter a4e4025cd4 Set default for the birthday of a person to null. 2018-09-09 11:52:50 +02:00
Lukas Halbritter cb0cfacced Removed merged files from last commit. 2018-09-09 11:46:42 +02:00
Lukas Halbritter ab3339bc0e Merged migration files. 2018-09-09 11:44:00 +02:00
Lukas Halbritter c44ae86dc9 Merge branch 'dev' into people 2018-09-09 10:57:19 +02:00