OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity
3684 commits 3 branches 67 tags 47 MiB
Commit graph

1030 commits

Author SHA1 Message Date
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
Paul Weidner
e8319fae70 Add farm_report permissions 2019-09-25 11:05:05 -04:00
Paul Weidner
565008af75 Add farm_report module, /farm/report path and menu item 2019-09-25 11:05:05 -04:00
Paul Weidner
6b32df38a6 Add a Weight graph to the Livestock Report tab 2019-09-25 11:05:05 -04:00
Paul Weidner
9ade46dc83 Only display the table of weights if weights have been logged 2019-09-25 11:05:05 -04:00
Paul Weidner
4df8640b60 Move the report view to farm_livestock_report.inc 2019-09-25 11:05:05 -04:00
Paul Weidner
3d0789c0df Display all recorded weights in the Animal Reports tab 2019-09-25 11:05:05 -04:00
Paul Weidner
ceaa03912b Update farm_quantity_log_asset_query to accept Type and Single arguments 2019-09-25 11:05:05 -04:00
Paul Weidner
04dca2cf53 Update farm_quantity_log_asset to search for multiple records. 2019-09-25 11:05:05 -04:00
Paul Weidner
91f938e106 Add simple animal report view, show ID and current weight 2019-09-25 11:05:05 -04:00
Paul Weidner
bbf9a7776f Add link to animal report 2019-09-25 11:05:05 -04:00
Michael Stenta
8ffb86c3dc Change "Length" measure label to "Length/depth". 2019-09-17 14:04:02 -04:00
Michael Stenta
da91c3d18f Add Feeds importer mapping for extra fields on Purchase logs. 2019-09-09 13:10:22 -04:00
Michael Stenta
1d4d513c3c Fix Notice: Undefined variable: entity_ids in farm_fields_autocomplete(). 2019-09-02 11:11:56 -04:00
Michael Stenta
e7c924307a Add a helper function for deleting a quantity measurement from a log, based on its label. 2019-08-27 14:22:20 -04:00
Michael Stenta
c4a67637e5 Make farm_quantity_log_update_measurement_by_label() more specific. 2019-08-27 14:21:35 -04:00
Michael Stenta
12c63b1c45 Create the base breadcrumb from the frontpage menu item, so "Farm" can be overridden. 2019-08-26 16:05:20 -04:00
Michael Stenta
b0d011bd7f Fix Views implicit relationship overwriting. 2019-08-23 16:56:39 -04:00
Michael Stenta
1db9cebd02 Describe the plan record relationship entity ID column to Views. 2019-08-23 14:06:14 -04:00
Michael Stenta
fd82b12a9f Create an implicit Views relationship between plan record relationship tables and the {farm_plan} table. 2019-08-23 14:06:00 -04:00
Michael Stenta
729e996261 Add a computed geometry property to assets that shows the geometry of their most recent completed movement log. 2019-08-23 11:32:09 -04:00
Michael Stenta
fa35ac74e8 Allow API access from https://farmOS.app. 2019-08-21 10:32:06 -04:00
Michael Stenta
acfa67867e Fix farm_plan_logs View not appearing on all plan types. 2019-08-14 09:42:05 -04:00
Michael Stenta
8ecff7de26 Add the Google Maps API key to /farm.json. 2019-08-12 21:19:25 -04:00
Michael Stenta
ffcd2a888a If a plan is made inactive, archive all assets linked to it, and vice versa. 2019-08-12 14:15:37 -04:00
Michael Stenta
0c8fdccef2 Fix lot number label in sale and purchase list columns. 2019-08-01 10:19:17 -04:00
Michael Stenta
cf66b789fb Add seed lot number field to seeding logs. 2019-08-01 10:19:17 -04:00
Skipper-is
ddbd920364 Added 3 commonly used audio formats for the allowed file upload types. #190 2019-07-31 09:04:15 -04:00
Mattias Sandström
39507038cd Fixed problems when BC math is missing #188 2019-07-18 12:37:52 -04:00
Michael Stenta
77476ea263 Remove debug statement. 2019-07-17 16:06:11 -04:00
Michael Stenta
d8ffffea8c Improve plan map rendering so that it matches maps on asset pages. 2019-07-17 15:33:59 -04:00
Michael Stenta
c5699e3df0 Enable Farm Fields Autocomplete module. 2019-07-17 13:42:29 -04:00
Michael Stenta
b768f07f87 Initial commit of farm fields autocomplete module. 2019-07-17 09:49:09 -04:00
Michael Stenta
8824cce727 Add system of measurement to /farm.json. 2019-07-11 21:05:31 -04:00
Michael Stenta
5126bbe98a Fix relative path in "entity is part of plan" message. 2019-07-11 16:07:35 -04:00
Michael Stenta
0f77fc7cd3 Summarize areas and assets associated with a plan. 2019-07-11 14:41:52 -04:00
Michael Stenta
316440f103 Update usage of $done in farm_movement_asset_location(). 2019-07-11 14:16:09 -04:00
Michael Stenta
4fe8b67d64 Farm Plan Map module: Adds a map of areas and assets in a plan. 2019-07-11 13:42:24 -04:00
Michael Stenta
3e4bbadf94 Fix "Area is in plan" message. Term entity is in $build['#term'] not $build['#entity']. 2019-07-11 13:36:12 -04:00
Michael Stenta
f37d7e7343 Fix implicit join between {taxonomy_term_data} and {farm_plan_area}. Table name is different than entity type machine name. 2019-07-11 13:35:22 -04:00
Michael Stenta
7028128655 Add a generic form for removing a record from a plan, and optionally deleting it. 2019-07-11 13:28:31 -04:00
Michael Stenta
9f9fd1d5a6 Refactor farm_plan_consideration_farm_constraint() to include information about considerations that reference entities. 2019-07-10 10:08:19 -04:00
Michael Stenta
90a3185431 Return farm_constraint_table_references() in farm_plan_farm_constraint(). 2019-07-10 10:08:19 -04:00
Michael Stenta
23227c0685 Split farm_constraint_table_references() out of farm_constraint_table_references_exist() and refactor to include information about matching records. 2019-07-10 10:08:19 -04:00
Michael Stenta
600e32519e Refactor farm_constraint_farm_constraint() to include information about field references and term children. 2019-07-10 10:08:19 -04:00
Michael Stenta
b76bd94821 Encourage implementations of hook_farm_constraint() to include more information. 2019-07-10 10:08:19 -04:00
Michael Stenta
d4fa850f25 Add @todo to provide better API constraint feedback. 2019-07-10 10:08:19 -04:00
Michael Stenta
64772671f2 Break farm_constraint_list() out of farm_constraint_exists(). 2019-07-10 10:08:19 -04:00
Michael Stenta
518e74aca3 Add missing $bundle parameter to farm_constraint_exists() docblock. 2019-07-10 10:08:19 -04:00
Michael Stenta
2d5b5eb28d Do not limit constraint field reference search. 2019-07-10 10:08:19 -04:00
Michael Stenta
766454b0b7 Split animal weight code to farm_livestock_weight. 2019-07-09 14:04:42 -04:00
Michael Stenta
71cc3c3508 Add a link to the farmOS forum on /farm/help. 2019-07-04 00:09:22 -04:00
Michael Stenta
dbbfd895ff Fix #180 Grouping error: 7 ERROR: column "ss_log.timestamp" must appear in the GROUP BY clause or be used in an aggregate function 2019-07-03 22:27:27 -04:00
Michael Stenta
bcc0a55039 Be more explicit with $type parameter docblock in log query functions. 2019-06-26 14:28:21 -04:00
Michael Stenta
97119dbd5a Allow filtering to find logs that are not done with farm_log_query(). 2019-06-26 14:27:47 -04:00
Michael Stenta
6490848025 When deleting a plan, display a list of records that will be unlinked. 2019-06-19 15:50:39 -04:00
Michael Stenta
ecf2d56ab9 Clean up plan/record relationships when entities are deleted. 2019-06-19 15:50:39 -04:00
Michael Stenta
72d1f50f6d Use entity_id() instead of entity_extract_ids(). 2019-06-19 14:15:40 -04:00
Michael Stenta
67de799b8c Fix path to plan in linked entity message. 2019-06-19 14:15:40 -04:00
Michael Stenta
eeb1d84639 Display message on entities: "this is part of plan X" 2019-06-05 10:00:00 -04:00
Michael Stenta
55718d104a Add a helper function for updating a log quantity measurement value based on its label. 2019-05-30 11:17:22 -04:00
Michael Stenta
4911902fd0 Display a View of logs associated with the plan on the plan entity view page. 2019-05-30 11:15:01 -04:00
Michael Stenta
1ca5db54c6 Add a View of logs associated with a plan. 2019-05-30 11:15:01 -04:00
Michael Stenta
1f083bfcc0 Describe relationships between plans and other record types to Views. 2019-05-30 11:15:01 -04:00
Michael Stenta
94291e4b92 Fix current location field maxlength is too short #175 2019-05-28 12:39:14 -04:00
Michael Stenta
ae578b2a9c Fix PHP Warning: A non-numeric value encountered in farm_area_calculate_area_multiple(). 2019-05-27 16:49:32 -04:00
Skipper-is
ca1d2c5919 Specify $conversion array key 
Specified the $conversion array's key.
 2019-05-25 10:07:05 +01:00
Michael Stenta
fba4868434 Add help text to views of plantings, seedings, and transplantings describing their differences. 2019-05-08 15:42:32 -04:00
Michael Stenta
f4413324c7 Add a function for loading a list of record IDs associated with a plan. 2019-05-08 13:12:15 -04:00
Michael Stenta
6d4b22309e Update farm_plan_link_record() and farm_plan_unlink_record() docblocks to reference farm_plan_record_relationships(). 2019-05-08 13:12:15 -04:00
Michael Stenta
49e8a2eec2 Add "Quantity" translatable to sale and purchase Views. 2019-05-01 11:01:42 -04:00
Michael Stenta
ebb67f72f8 Allow linking Sale and Purchase logs to Areas. 2019-05-01 11:01:35 -04:00
Michael Stenta
5fca7fc32a Use farm_plan_record_relationships() in farm_plan_plan_constraint(). 2019-04-30 15:23:36 -04:00
Michael Stenta
0c9f869526 Add functions for linking/unlinking plans with other records. 2019-04-30 15:23:36 -04:00
Michael Stenta
c257e286a9 Implement hook_farm_constraint() to prevent deletion of records linked to plans. 2019-04-30 15:19:10 -04:00
Michael Stenta
660ad0c142 Add a helper function for checking to see if an entity reference exists in a database table. 2019-04-30 15:19:10 -04:00
Michael Stenta
37270ec25c Add new database schemas for maintaining links between plans and other farmOS records (areas, assets, logs, and people). 2019-04-30 11:01:49 -04:00
Michael Stenta
cd5d51541c Revert "Default to showing "any" logs in quantity report View (done and not done)." 
This reverts commit f327a8997d.
 2019-04-30 10:33:14 -04:00
Michael Stenta
f327a8997d Default to showing "any" logs in quantity report View (done and not done). 2019-04-30 10:17:09 -04:00
Michael Stenta
beb14d984c Issue #3043569: API field aliasing overrides existing fields 2019-04-24 17:13:53 -04:00
Michael Stenta
65b58591da Display all results in sensor data CSV export. 2019-04-23 17:48:33 -04:00
Michael Stenta
e4f9f5764b Add equipment use logs to equipment page. 2019-04-18 16:23:34 -04:00
Michael Stenta
a3b86164ed View of Equipment use logs, with an required contextual filter for the equipment asset. 2019-04-18 16:23:34 -04:00