Commit Graph

3651 Commits

Author SHA1 Message Date
Michael Stenta 3e5a8e777d Only clean up numeric entity IDs in farm_plan_entity_delete(). 2019-10-15 15:43:12 -04:00
Michael Stenta 79f0a84d91 Only clean up numeric entity IDs in farm_quick_entity_delete(). 2019-10-15 15:35:31 -04:00
Michael Stenta 296bad2c4b Remove wildcard from NRCS STIR autocomplete path so that it can be used in anonymous forms. 2019-10-14 14:02:36 -04:00
Michael Stenta f731b378da Only include observation logs in livestock weight reports. #208 2019-10-10 12:40:21 -04:00
Michael Stenta 58da53db12 Merge branch 'asset_names_import' into 7.x-1.x 2019-10-09 12:38:43 -04:00
Michael Stenta d47db78086 Trim whitespace from CSV fields: Asset names, Parent names, Areas, Categories, Crop/variety, Nicknames, Material. 2019-10-09 12:38:25 -04:00
Michael Stenta 148eda32b0 Issue #3086611: Allow CSV imports to reference assets by name 2019-10-09 12:38:25 -04:00
Michael Stenta 700786444a Sort asset entity reference selection by asset ID descending. 2019-10-09 12:38:25 -04:00
Michael Stenta 74e2e091ed Support importing multiple Materials with input log CSVs. 2019-10-09 12:38:25 -04:00
Michael Stenta 2818877ea1 Autocreate Materials when importing input logs. 2019-10-09 12:38:25 -04:00
Michael Stenta 6c6ada79ce Fix birth log importer's mother reference target. 2019-10-09 12:38:25 -04:00
Michael Stenta f13327f584 Add farm_report module, simple CSV export of animal weights, simple graph of animal weights. #189 2019-09-25 11:05:53 -04:00
Paul Weidner 66f08494e2 Use the average weight calculated on the server in graphs. 2019-09-25 11:05:05 -04:00
Paul Weidner 61df12ed89 Add the average animal gain per day to group report 2019-09-25 11:05:05 -04:00
Paul Weidner f17c1c448a Rename Average Weight graph 2019-09-25 11:05:05 -04:00
Paul Weidner ced00f371f Display graphs of average animal weights in group reports 2019-09-25 11:05:05 -04:00
Paul Weidner 875c46bbc6 Update group report, display HTML table and CSV Export 2019-09-25 11:05:05 -04:00
Paul Weidner 8bc35866bb Update name of individual report method. 2019-09-25 11:05:05 -04:00
Michael Stenta e99011881c Move individual weight report access callback to main module file. 2019-09-25 11:05:05 -04:00
Paul Weidner 76ace07782 Improve header formatting of CSV 2019-09-25 11:05:05 -04:00
Paul Weidner 229630bf5a Change to use a while loop to walk through columns + logs 2019-09-25 11:05:05 -04:00
Paul Weidner 655daacec1 Collect log dates unique to each animal 2019-09-25 11:05:05 -04:00
Paul Weidner a49c727a56 Unset the default start date, change the date_year_range to -10:+1 2019-09-25 11:05:05 -04:00
Paul Weidner 37dacdb43e Change CSV format to one animal per line, columns specific to date 2019-09-25 11:05:05 -04:00
Michael Stenta ee480ec590 Generalize farm_report.info description - not just for assets. 2019-09-25 11:05:05 -04:00
Michael Stenta d453bad45f Remove asset ID and make "Current weight" bold. 2019-09-25 11:05:05 -04:00
Michael Stenta 6ad3ac254d Float graph to the right of the weights table. 2019-09-25 11:05:05 -04:00
Michael Stenta 1f1f8105a4 Allow creating a report of groups that contain other asset types in addition to animals (but skip them). 2019-09-25 11:05:05 -04:00
Michael Stenta 5e0c4e7507 Fix farm_livestock_weight_report_access(). 2019-09-25 11:05:05 -04:00
Michael Stenta 62d5da2774 Move Quantity report to /farm/report/quantity, depend on farm_report, install farm_report on existing sites. 2019-09-25 11:05:05 -04:00
Michael Stenta c44662ed6c Install the Farm Report module (dependency of Livestock Weight Report). 2019-09-25 11:05:05 -04:00
Michael Stenta c9a21f92e2 Add a default "Info" tab to /farm/reports. Make weight report a local task. 2019-09-25 11:05:05 -04:00
Michael Stenta cddb77a4d6 Remove unnecessary dependencies from farm_report. 2019-09-25 11:05:05 -04:00
Michael Stenta a731896a5e Pass $end_date into farm_quantity_log_asset() as the timestamp upper bound. 2019-09-25 11:05:05 -04:00
Michael Stenta a1e802b8f8 Do not include parameter variables in function call. 2019-09-25 11:05:05 -04:00
Michael Stenta 0a34e87a6d Simplify start/end date default value code. 2019-09-25 11:05:05 -04:00
Michael Stenta f629d8d9fd Misc whitespace, comments, Drupal coding standards fixes. 2019-09-25 11:05:05 -04:00
Michael Stenta 518a2db188 Update farm_quantity_log_asset() docblock. 2019-09-25 11:05:05 -04:00
Paul Weidner f29b18742e Save weights for graph 2019-09-25 11:05:05 -04:00
Paul Weidner d7c5c9fe33 Prevent Weight tab from appearing on non-animal assets 2019-09-25 11:05:05 -04:00
Paul Weidner e64090e04f Change the name of animal weight graph page from 'report' to 'weight' 2019-09-25 11:05:05 -04:00
Michael Stenta 215db36ea2 Update farm_quantity_log_asset_query() docblock. 2019-09-25 11:05:05 -04:00
Paul Weidner 8e72ca9d45 Update the name of the JS graph behavior 2019-09-25 11:05:05 -04:00
Paul Weidner ed7d893842 Use the drupal theme function to render table of recorded weights 2019-09-25 11:05:05 -04:00
Paul Weidner 473af40b07 Clean code. Use else statement and load multiple logs at once 2019-09-25 11:05:05 -04:00
Paul Weidner ae7f8df22c Add start and end date filter to CSV export 2019-09-25 11:05:05 -04:00
Paul Weidner d4276befcf Export CSV file of weights from all animals of selected group(s) 2019-09-25 11:05:05 -04:00
Paul Weidner f2fc551b54 Remove the group ID from Select list 2019-09-25 11:05:05 -04:00
Paul Weidner 366332c4ba Add a form for selecting groups of animal assets 2019-09-25 11:05:05 -04:00
Paul Weidner 0403bf6980 Move Reports to a tab, out of the Farm menu 2019-09-25 11:05:05 -04:00