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
3080 commits 3 branches 67 tags 47 MiB
Commit graph

615 commits

Author SHA1 Message Date
Michael Stenta
1f4e49c504 Show members of a group when viewing a group's page. 2017-11-24 20:58:33 -05:00
Michael Stenta
4b4542c097 Add a View for displaying members of a group. 2017-11-24 20:58:33 -05:00
Michael Stenta
58138651cd Add a Views relationship handler for linking assets to their latest group membership log. 2017-11-24 20:58:33 -05:00
Michael Stenta
cc717f2854 Abstract the Views relationship handler for linking assets to their movement logs so that it can be used for other purposes (like group membership). 2017-11-24 20:58:33 -05:00
Michael Stenta
4e48221726 When a log form with a group reference field is submitted validate that assets are referenced and they don't create a circular membership. 2017-11-24 20:58:33 -05:00
Michael Stenta
0731214b3d Add a function to check for circular group membership. 2017-11-24 20:58:33 -05:00
Michael Stenta
e1a47a0691 Add functions for querying the membership of an asset (similar to farm_movement's location code). 2017-11-24 20:58:33 -05:00
Michael Stenta
b0f8ceb439 Move areas, movement, and inventory field displays relative to assets, and other field display consistency fixes. 2017-11-24 20:58:33 -05:00
Michael Stenta
59f706dd27 Add "Group Membership" fieldset and "Group" reference field to activity and observation logs. 2017-11-24 20:58:33 -05:00
Michael Stenta
21bbcb171a Add a group reference field base. 2017-11-24 20:58:33 -05:00
Michael Stenta
5c212fc63a Add a View for selecting Group assets (via entityreference_view_widget). 2017-11-24 20:58:33 -05:00
Michael Stenta
8f6eba3940 Reorganize group asset fields into Easy Responsive Tabs. 2017-11-24 20:58:33 -05:00
Michael Stenta
71a2662eb7 Implement hook_farm_ui_entities() to describe the Group asset type to the Farm UI module. 2017-11-24 20:58:33 -05:00
Michael Stenta
4369e7cbc8 Add a View of Groups at /farm/assets/groups. 2017-11-24 20:58:33 -05:00
Michael Stenta
86768afbc3 Initial commit of Farm Group module: provide a basic Group asset type. 2017-11-24 20:58:33 -05:00
Michael Stenta
a9743fa150 Query to retrieve movement logs to an area should never use the $single parameter. 2017-11-24 20:57:47 -05:00
Michael Stenta
c00305f71c Add a function for retrieving an area's movement history. 2017-11-24 20:57:47 -05:00
Michael Stenta
ba58dc436a Add a function for getting an asset's next movement log. 2017-11-24 20:57:47 -05:00
Michael Stenta
d27a9114c8 Make farm_log_query() range limit optional with a new $single parameter. 2017-11-24 20:57:47 -05:00
Michael Stenta
6d39abe4d9 Remove $log_id_field parameter from farm_log_query() to simplify. Add the field where needed. 2017-11-24 20:57:47 -05:00
Michael Stenta
9cc6d12162 Add farm_movement_area_movement_query() for building a query that finds movement logs to a specific area. 2017-11-24 20:57:47 -05:00
Michael Stenta
e96a19173b Add a measure for area. 2017-11-24 20:56:32 -05:00
Michael Stenta
d61fd7500b Create a function for defining information about available quantity measures. 2017-11-24 20:56:32 -05:00
Michael Stenta
68f5eba9d0 Replace Sale log Quantity field collection with individual Quantity and Units fields. 2017-11-24 20:56:32 -05:00
Michael Stenta
4d1fde71c6 Make Units field not required. 2017-11-24 20:56:32 -05:00
Michael Stenta
191aa90f0b Arrange quantity field display. 2017-11-24 20:56:32 -05:00
Michael Stenta
ae939e345a Use farm_log_asset_query() to build quantity query. 2017-11-24 20:56:32 -05:00
Michael Stenta
efb3c20073 Add functions for loading quantity data for a specific asset, optionally given a measure and/or label. 2017-11-24 20:56:32 -05:00
Michael Stenta
6a1f70fd73 Allow multiple quantities to be entered on each log. Hide initial form and require user to add first item. 2017-11-24 20:56:32 -05:00
Michael Stenta
e92d6f4fec Add a Label field to Quantities. 2017-11-24 20:56:32 -05:00
Michael Stenta
ee6e0d264a Update Quantity field instance descriptions to include Measure. 2017-11-24 20:56:32 -05:00
Michael Stenta
1c29669b37 Add a function that defines the available options for the Measure field. 2017-11-24 20:56:32 -05:00
Michael Stenta
d309c509a7 Add a Measure field to Quantities. 2017-11-24 20:56:32 -05:00
Michael Stenta
91160a7b3d Add an index on 'name' and 'value' columns in {farm_asset_property}. 2017-11-24 20:55:50 -05:00
Michael Stenta
539a52f0aa Change asset property database value column to a varchar. 2017-11-24 20:55:50 -05:00
Michael Stenta
ce4b3c1485 Allow a default value to be set when getting an asset property (similar to variable_get()). 2017-11-24 20:55:50 -05:00
Michael Stenta
32d4a01d0e Implement hook_entity_delete() to clean up asset properties if an asset is deleted. 2017-11-24 20:55:50 -05:00
Michael Stenta
773605951c Add functions for getting, setting, deleting, and checking whether or not a property is set. 2017-11-24 20:55:50 -05:00
Michael Stenta
f1e75d5ba4 Initial commit: provide a {farm_asset_property} key/value database table. 2017-11-14 13:52:30 -05:00
Michael Stenta
b327a64eae Minor doc fix in hook_farm_ui_entity_view_groups(). 2017-11-14 13:45:37 -05:00
Michael Stenta
3a61454104 Do not allow collapsing farm_ui groups. 2017-11-14 13:45:37 -05:00
Michael Stenta
cf84a3af07 Put all log Views in the "logs" farm_ui group and change the group name to "Logs by type". 2017-11-14 13:45:37 -05:00
Michael Stenta
0116ee4d41 Put asset children View in the "assets" farm_ui group. 2017-11-14 13:45:37 -05:00
Michael Stenta
a6da002c62 Add a group for "Logs with special purpose" and put movement and inventory logs in there via farm_ui. 2017-11-14 13:45:37 -05:00
Michael Stenta
67034ecba3 Change "Logs with [movements/inventory]" to "Logs of [movements/inventory]". 2017-11-14 13:45:20 -05:00
Michael Stenta
181e157b78 Remove feeds tamper that makes animal sex field required. 2017-11-14 13:44:22 -05:00
Michael Stenta
515f2cb27e Improvements to asset form help text to support non-individual animals. 2017-11-14 13:44:22 -05:00
Michael Stenta
c79cc63c59 Move Animal birthdate, sex, castrated, and nickname fields to new Individual fieldset. Make sex field optional. 2017-11-14 13:44:22 -05:00
Michael Stenta
cc534563ad Add inventory column to Animals list. 2017-11-14 13:44:22 -05:00
Michael Stenta
e340995f64 Enable inventory tracking for animal assets, and treat them as individuals by default. 2017-11-14 13:44:22 -05:00
Michael Stenta
a429d6b79d Use fraction::subtract() method in farm_inventory_set(). 2017-11-14 13:43:11 -05:00
Michael Stenta
465172c888 Fix comment. 2017-11-14 13:43:11 -05:00
Michael Stenta
c0cd29b5de Minor comment fixes. 2017-11-14 13:43:11 -05:00
Michael Stenta
529c882f18 Remove $asset_filter parameter from farm_log_asset_query() because it is no longer necessary. 2017-11-14 13:43:11 -05:00
Michael Stenta
7563441108 Use farm_log_query() directly in farm_inventory_query(), since it performs its own asset join. 2017-11-14 13:43:11 -05:00
Michael Stenta
2002a3bc0e Further abstract farm_log_asset_query() by creating an even more general farm_log_query(). 2017-11-14 13:43:11 -05:00
Michael Stenta
d37c84c78e Use farm_log_asset_query() to build inventory query. 2017-11-14 13:43:11 -05:00
Michael Stenta
89435b551f Generalize the query function for selecting logs that reference an asset, so farm_inventory can use it. 2017-11-14 13:43:11 -05:00
Michael Stenta
11799bdf7e Add Views field handler for asset inventory value. 2017-11-14 13:43:11 -05:00
Michael Stenta
87f053cb4f Create function for formatting inventory values. 2017-11-14 13:43:11 -05:00
Michael Stenta
8f8e420766 Add an Inventory field to asset edit form that allows setting the current inventory (via programatic log creation). 2017-11-14 13:43:11 -05:00
Michael Stenta
3312a1862e Add a function for programatically creating a log that sets the current inventory level. 2017-11-14 13:43:11 -05:00
Michael Stenta
0fca8f5e80 Use farm_inventory_entityreference_view for selecting assets in inventory adjustment. 2017-11-14 13:43:11 -05:00
Michael Stenta
8a3c836965 Create an Entity Reference View for selecting assets that have inventory enabled. 2017-11-14 13:43:11 -05:00
Michael Stenta
0a2b5aca2f Add custom Views asset type filter handler that only includes types with inventory enabled. 2017-11-14 13:43:11 -05:00
Michael Stenta
6055054b19 Add a function that returns a list of asset types with inventory enabled. 2017-11-14 13:43:11 -05:00
Michael Stenta
7c5751c851 Add Views integration for {farm_inventory_asset_type} table. 2017-11-14 13:43:11 -05:00
Michael Stenta
4450218403 Show "logs with inventory adjustments" on asset pages. 2017-11-14 13:43:11 -05:00
Michael Stenta
8ff76032c5 Add a View of "logs with inventory adjustments". 2017-11-14 13:43:11 -05:00
Michael Stenta
41c9c9e516 Default the inventory of "individual" assets to 1. 2017-11-14 13:43:11 -05:00
Michael Stenta
9360563ed8 Only display inventory if it is enabled for assets. 2017-11-14 13:43:11 -05:00
Michael Stenta
7f7c9b399c Add functions that check if inventory management is enabled on an asset, and whether or not to treat an asset as an individual by default. 2017-11-14 13:43:11 -05:00
Michael Stenta
a3e945faad Alter asset type form to show inventory settings. 2017-11-14 13:43:11 -05:00
Michael Stenta
b658eba543 Implement hooks for entity load, insert, update, and delete to maintain asset type inventory settings. 2017-11-14 13:43:11 -05:00
Michael Stenta
5789e39117 Add a {farm_inventory_asset_type} database table for storing asset type inventory settings. 2017-11-14 13:43:11 -05:00
Michael Stenta
38795bd083 Add comment about views_subquery_join to farm_inventory_query() and make joins consistent with farm_log_movement. 2017-11-14 13:43:11 -05:00
Michael Stenta
be84e4e38b Display asset inventory on asset view pages. 2017-11-14 13:43:11 -05:00
Michael Stenta
ab56721f24 Add function for calculating an asset's inventory: farm_inventory() and farm_inventory_query(). 2017-11-14 13:43:11 -05:00
Michael Stenta
f9dc1a65c0 Add Inventory field collection to log types: Input, Activity, Harvest, Seeding, Transplanting, Medical, Observation, Sale, Maintenance. 2017-11-14 13:43:11 -05:00
Michael Stenta
40c248a29e Add an inventory field collection with asset and value fields. 2017-11-14 13:43:11 -05:00
Michael Stenta
a68b918b87 Initial commit of farm_inventory module (empty). 2017-11-14 13:43:11 -05:00
Michael Stenta
667d241f6e Minor comment fix. 2017-10-16 08:36:14 -04:00
Michael Stenta
c727a583f5 Use #tree in Location fieldset form to simplify array keys. 2017-10-16 08:36:14 -04:00
Michael Stenta
167a6441c0 Change weight of Sensors page menu item to < 100. 2017-10-16 08:36:14 -04:00
Michael Stenta
8b94441182 Disable AJAX in sensor data View. 2017-10-16 08:36:14 -04:00
Michael Stenta
9d43bd15f0 Make Farm Sensor: Listener module into a Feature for diff tracking purposes. 2017-10-16 08:36:14 -04:00
Michael Stenta
7dc626a450 Issue #2915011: Move farm_log_movement to farm_movement 2017-10-10 18:07:50 -04:00
Michael Stenta
01f95f3058 Fix farm_log dependencies. Stop using it to automatically install activity, harvest, input, and observation modules. 2017-10-10 17:59:32 -04:00
Michael Stenta
29b07ea34a Add menu items for "All assets" and "All logs". 2017-10-10 17:31:38 -04:00
Michael Stenta
30d1cc7be1 Minor changes/improvements to location query joins/filters. 2017-10-10 17:30:50 -04:00
Michael Stenta
0e1f1fa099 Add note about views_join_subquery condition() limitation to farm_log_movement_asset_movement_query(). Pass $asset_id through db_escape_field(). 2017-10-10 17:30:11 -04:00
Michael Stenta
943583d6c4 Fix docblock for farm_log_movement_asset_movement_query(). 2017-10-10 17:30:03 -04:00
Michael Stenta
1c7e8ce639 Fix farmOS.org link in farm_help. 2017-10-10 17:20:58 -04:00
Michael Stenta
0740801da7 Implement hook_help() in the farm_help module. 2017-10-10 17:20:52 -04:00
Michael Stenta
86ab32c92e Allow sort criteria to be specified in farm_area_load_areas(). Default to 'id'. 2017-10-02 10:49:12 -04:00
Michael Stenta
0ac1cbfbdd Issue #2912810: Notice: Undefined offset: 0 in farm_sensor_listener_process_data() (line 182 of .../farm_sensor_listener.module) 2017-09-29 11:52:04 -04:00
Michael Stenta
33099b9526 Whitespace. 2017-09-29 10:21:45 -04:00
Michael Stenta
6e957d14b6 Issue #2912780: Add a hook that fires when sensor data is POSTed 2017-09-29 10:21:41 -04:00
Michael Stenta
002e74ed35 Issue #2912480: Automatically convert date string to Unix timestamp in POSTed data 2017-09-29 10:17:49 -04:00
Michael Stenta
92550ae504 Issue #2911912: Remove watchdog() debugging. 2017-09-26 16:42:49 -04:00
Michael Stenta
3835ad4356 Issue #2911912: Location field followed by Move button causes incorrect asset location 2017-09-26 16:40:24 -04:00
Michael Stenta
b2f7d09459 Remove separator from sale log ID. 2017-09-26 13:35:22 -04:00
Michael Stenta
cff9ecd624 Fix soil name lookup button. 2017-09-26 13:30:08 -04:00
Michael Stenta
3385ab022b Add "Location", "Plan", and "Sensor configuration" fieldsets to "General" group. 2017-09-26 13:30:08 -04:00
Michael Stenta
d144c772ce Put Movement Geometry field into a fieldgroup. 2017-09-26 13:30:08 -04:00
Michael Stenta
66b88adb3b Reorganize all asset and log fields into Easy Responsive Tabs. 2017-09-26 13:30:08 -04:00
Michael Stenta
de4afa2111 Merge branch 'openlayers_update' into 7.x-1.x 2017-09-25 17:22:17 -04:00
Michael Stenta
e760284e6c Minor comment fix. 2017-09-25 17:20:43 -04:00
Michael Stenta
0892b31ff3 Use ol4 branch of mstenta/openlayers to fix ZoomToSource Components. See https://www.drupal.org/node/2911611. 2017-09-25 17:19:29 -04:00
Michael Stenta
3243c5af92 Fix custom InlineJS styles. See https://www.drupal.org/node/2911566. 2017-09-25 17:19:15 -04:00
Michael Stenta
d266d3df2f Reverse the order of all farmOS map layers, to undo change in Openlayers module. 2017-09-25 17:19:08 -04:00
Michael Stenta
d4500aefe4 Update Openlayers Popup components to match changes in module. 2017-09-25 09:42:38 -04:00
Michael Stenta
04ced2c76b Ensure that the "base layers" group is always at the bottom of farm map layers. 2017-09-25 09:32:44 -04:00
Michael Stenta
96302964ba Migrate field_farm_water_sample_points to field_farm_geofield. 2017-09-14 08:40:14 -04:00
Michael Stenta
365062a6c0 Migrate field_farm_soil_sample_points to field_farm_geofield. 2017-09-14 08:40:14 -04:00
Michael Stenta
8551b39cd4 Fix default value of input "date purchased" field (should be blank). 2017-09-11 10:15:42 -04:00
Michael Stenta
566953bc9c Display asset ID column in farm_asset View. 2017-09-07 17:23:33 -04:00
Michael Stenta
ceabc95f24 Fix farm_asset Views export name. 2017-09-07 17:23:25 -04:00
Michael Stenta
eb8bfbd646 Make farm_asset into a Features module to ease tracking of changes to farm_asset View. 2017-09-07 17:23:12 -04:00
Michael Stenta
436b7b803d Add a function for loading areas of a given type. 2017-09-05 16:18:00 -04:00
Michael Stenta
4a3aa73f6d Update farm_asset View export, and remove comma separator from asset IDs. 2017-09-05 11:53:03 -04:00
Michael Stenta
e73996df18 Small grammatical fix. 2017-09-04 13:50:15 -04:00
Michael Stenta
c207e3ee2f Issue #2884947: Add a shortcut configuration form for Google Maps API key 2017-09-04 13:38:18 -04:00
Michael Stenta
6352fdf8eb Add OSM source and layer to info file. 2017-09-04 13:37:43 -04:00
Michael Stenta
503d05912f Clean up new variable on uninstall. 2017-09-04 13:07:03 -04:00
Michael Stenta
076b190e37 Issue #2772955: Add configuration for default map base layer 2017-09-04 13:06:12 -04:00
Michael Stenta
370e1fc778 Issue #2906648: Add openStreetMaps layer(s) 2017-09-04 12:34:37 -04:00
Michael Stenta
cb2e8716e3 Change "Owner" to "Assigned to" in log field instances and views. 2017-09-04 11:51:19 -04:00
Michael Stenta
82d29d81dd Issue #2906277: Can't enter new animal birth dates before 2014 2017-09-01 21:06:52 -04:00
Michael Stenta
00d1f17132 Make it possible to append or replace assignments. 2017-08-30 13:13:46 -04:00
Michael Stenta
28c00de93e Misc log Views update: add skip_permission_check setting. 2017-08-30 09:18:06 -04:00
Michael Stenta
73d2d276ad Misc log Views update: make rows clickable. 2017-08-30 09:17:40 -04:00
Michael Stenta
705e370065 Add "Assign" button to all log Views. 2017-08-30 09:16:01 -04:00
Michael Stenta
22094d799a Fix "Owner" field in Views so that it shows multiple owners. 2017-08-30 09:11:32 -04:00
Michael Stenta
3d4c24070f Create an action for assigning logs to users in bulk. 2017-08-29 17:51:01 -04:00
Michael Stenta
3bcf58ee8e Create a function for loading farm roles. 2017-08-29 15:47:44 -04:00
Michael Stenta
03320bbdf2 Issue #2905140: Simplify asset "Move" action 2017-08-28 12:03:19 -04:00
Michael Stenta
b9c335734e Add missing dependencies to farm_import. 2017-08-22 14:17:13 -04:00
Michael Stenta
79a2565466 Mark Farm Log: Sale module as beta. 2017-08-22 13:28:42 -04:00
Michael Stenta
3d5fdeb078 Enable new Farm Season and remove Farm Taxonomy via update.php. 2017-08-22 13:01:02 -04:00
Michael Stenta
0c57d6c3ca Move Log Categories taxonomy to farm_fields module. 2017-08-22 12:59:09 -04:00
Michael Stenta
d145f2728f Move Materials taxonomy to farm_log_input module. 2017-08-22 12:59:08 -04:00
Michael Stenta
5e7dd810da Move Season taxonomy and date range field to new Farm Season module. 2017-08-22 12:37:25 -04:00
Michael Stenta
a9d494f419 Delete field bundle settings. 2017-08-22 12:35:56 -04:00
Michael Stenta
037c798910 Issue #2903890: Pre-populating multiple assets in log forms broken 2017-08-22 11:07:24 -04:00
Michael Stenta
02b7ff861d Add translatables to farm_sensor_data View. 2017-08-16 16:01:49 -04:00
Michael Stenta
c9feaa2380 Require 'view any sensor farm assets' permission to view sensor data. 2017-08-16 16:01:30 -04:00
Michael Stenta
ffe02af122 Change "Last login" to "Last access" in /farm/people. 2017-08-15 08:47:30 -04:00
Michael Stenta
9d89f78694 Issue #2902064: Logs are not being auto-associated with assets 2017-08-14 10:37:25 -04:00
Michael Stenta
b39df3fe5c If there are no assets/logs in an area, do not display label in area details. 2017-08-14 10:06:45 -04:00
Michael Stenta
e33f4fdea0 Issue #2902053: Access denied on log imports 2017-08-14 09:58:33 -04:00
Michael Stenta
0a837b2bdb Add translatables to Farm Assets View. 2017-08-06 13:54:39 -04:00
Michael Stenta
e4b86ce6b9 Set log owner when auto-creating movement logs. 2017-08-06 13:52:23 -04:00
Michael Stenta
6f3cdc54f7 Update movement from/to field default values. 2017-08-06 13:52:23 -04:00
Michael Stenta
ddaa96921e Change animal birthdate field widget to select. 2017-08-06 13:52:23 -04:00
Michael Stenta
8d121ad75e Autopopulate categories on certain log types. 2017-08-06 13:52:23 -04:00
Michael Stenta
49d02ed7b9 Remove remember_roles from asset children View. 2017-08-06 13:51:02 -04:00
Michael Stenta
5208f4b5bf Misc Views updates: rearranging fields for importer consistency, updating export code, etc. 2017-08-06 13:51:02 -04:00
Michael Stenta
c447dfdccc Add Assets field to Seeding and Transplanting log Views. 2017-08-06 13:51:01 -04:00
Michael Stenta
639eba41a6 Add Manufacturer, Model, and Serial number fields to Equipment View. 2017-08-06 13:51:01 -04:00
Michael Stenta
175dca99ac Add Description and Active fields to all asset Views. 2017-08-06 13:51:01 -04:00
Michael Stenta
02de0315b4 Add Notes field to all Log Views. 2017-08-06 13:51:01 -04:00
Michael Stenta
c9be834848 Change "Category" to "Categories" in Views for consistency with Feeds importers. 2017-08-06 13:51:01 -04:00
Michael Stenta
1b7f7d32b2 Use "Name" for all log name fields in Views. 2017-08-06 13:50:05 -04:00
Michael Stenta
534245f983 Fix field name capitalization. 2017-08-06 13:50:05 -04:00
Michael Stenta
2b7295fd23 Change "Category names" column to "Categories" in importer for consistency with Views exports. 2017-08-06 13:41:45 -04:00
Michael Stenta
b2e41f4254 Fix undefined settings in log importer term mappings. 2017-08-06 13:41:36 -04:00
Michael Stenta
7706d5b479 Convert "male" to "M" and "female" to "F". 2017-08-06 13:41:25 -04:00
Michael Stenta
3f0ee87928 Default imported assets to active, and logs to done, if no value is provided. 2017-08-06 13:41:19 -04:00
Michael Stenta
0bcaf0673d Display message when required fields are omitted in Feeds. 2017-07-21 14:51:39 -04:00
Michael Stenta
62986eb2d1 Set asset/log author to the user running the importer. 2017-07-21 14:21:48 -04:00
Michael Stenta
6ba444c322 Add extra field mappings and tamper plugins for all log types. 2017-07-21 14:21:48 -04:00
Michael Stenta
0651fa0c7c Add tamper plugins for planting and animal imports. 2017-07-21 14:21:48 -04:00
Michael Stenta
1ac330a9ef Convert active and done to boolean. 2017-07-21 14:21:48 -04:00
Michael Stenta
8f693b5a8c Add a helper function for building Feeds Tamper plugins. 2017-07-21 14:21:48 -04:00
Michael Stenta
cd16fb7bf8 Add extra Feeds field mapping to plantings, animals, and equipment. 2017-07-21 14:21:48 -04:00
Michael Stenta
12f4222f42 Remove asset created mapping. 2017-07-21 14:21:48 -04:00
Michael Stenta
b2c9d98d70 Convert log dates to timestamps. 2017-07-21 14:21:48 -04:00
Michael Stenta
a52280e7e4 Minor simplification of tamper code. 2017-07-21 14:21:48 -04:00
Michael Stenta
e886365d7d Do not allow updating of assets/logs via the CSV importers. Only create new. 2017-07-21 14:21:48 -04:00
Michael Stenta
1e98654344 Add action links to log importers on listing pages. 2017-07-21 14:21:48 -04:00
Michael Stenta
1efb0ec990 Add Quantity value and unit mappings, if the field exists. 2017-07-21 14:21:48 -04:00
Michael Stenta
691b4ab68c Automatically provide simple importers for each log type. 2017-07-21 14:21:48 -04:00
Michael Stenta
bd3de50b0f Only add field mappings if the fields exist on the asset bundle. 2017-07-21 14:21:48 -04:00
Michael Stenta
c3dc2e6076 Use Feeds Tamper to make asset name fields required and explode parent IDs into an array. 2017-07-21 14:21:48 -04:00
Michael Stenta
03fd5d4441 Grant farm managers access to Feeds importers. 2017-07-21 14:21:48 -04:00
Michael Stenta
822c9dbec0 Add action links to asset importers on asset listing pages. 2017-07-21 14:21:48 -04:00
Michael Stenta
da5fa1bf6d Revert "Remove hook_farm_ui_actions() because farm_ui is the only module implementing it now." 
This reverts commit 0060a95262 and updates the code accordingly.
 2017-07-21 14:21:48 -04:00
Michael Stenta
b385e336c4 Initial commit of Farm Import module: automatically provide simple importers for each asset type. 2017-07-21 14:21:48 -04:00
Michael Stenta
a4019ac9a4 Issue #2402193: Integrate Farm Asset with Feeds module 2017-07-21 14:21:48 -04:00
Michael Stenta
1e555ed0fa Consolidate file and image field file extensions in a helper function. 2017-07-21 14:21:20 -04:00
Michael Stenta
7b7e5268ea Fix water test area reference default value. 2017-07-21 14:20:48 -04:00
Michael Stenta
ff99ed518a Add Category field to all logs that don't already have it. 2017-07-21 14:20:41 -04:00
Michael Stenta
6b0fe1d259 Allow prepopulating log categories from query parameter. 2017-07-17 14:45:58 -04:00
Michael Stenta
13090d01c0 Merge farm_log_ids_from_url() into farm_log_prepopulate_log_form_references(). 2017-07-17 14:45:58 -04:00
Michael Stenta
4cc5523d08 Allow prepopulating log names from query parameter. 2017-07-17 14:45:58 -04:00
Michael Stenta
0220a48dbc Revert "Add an Entityreference View for Areas." 
This reverts commit 67540bf1a9.
 2017-07-13 08:59:13 -04:00
Michael Stenta
865d950880 Change area reference field widget on harvest logs to a select list. 2017-07-13 08:58:35 -04:00
Michael Stenta
6d438c381e Revert "Use the Entityreference View for the area reference field selection widget." 
This reverts commit c2ed7b4b15.
 2017-07-13 08:55:42 -04:00
Michael Stenta
4780101918 Add area reference field to harvest logs. 2017-07-11 09:32:23 -04:00
Michael Stenta
1ca2cfd3f4 Make area reference field descriptions consistent and grammatically correct. 2017-07-11 09:31:58 -04:00
Michael Stenta
c2ed7b4b15 Use the Entityreference View for the area reference field selection widget. 2017-07-11 09:31:00 -04:00
Michael Stenta
67540bf1a9 Add an Entityreference View for Areas. 2017-07-11 09:29:27 -04:00
Michael Stenta
6693255962 Sort area list by weight first, name second. 2017-07-11 08:45:48 -04:00
Michael Stenta
2dd87ab252 Fix empty check on entityreference_view_widget fields. 2017-07-11 08:24:55 -04:00
Michael Stenta
3fd34b6bfd Fix reference prepopulation for area fields. 2017-07-11 08:24:55 -04:00
Michael Stenta
f641a65631 Move entityreference prepopulation helper function from farm_log.module to farm_fields.module. 2017-07-11 08:24:55 -04:00
Michael Stenta
35dc4580c2 Consolidate log entityreference field prepopulation logic. 2017-07-11 08:24:55 -04:00
Michael Stenta
58fc9e86b4 Make log field prepopulation function params and returns consistent. 2017-07-11 08:24:55 -04:00
Michael Stenta
84bf16e237 Misc Views export fixes. 2017-07-11 08:23:31 -04:00
Michael Stenta
a01a3696ba Update Field Collection export for Quantity field. 2017-07-10 08:59:01 -04:00
Michael Stenta
5ed997d207 Export Fraction field settings to Features. 2017-07-10 08:58:46 -04:00
Michael Stenta
8327295df6 Make lot number field labels/descriptions more specific. 2017-07-10 08:57:24 -04:00
Michael Stenta
ba964a5dbb Change Animal "Type" to "Species/breed". 2017-07-10 08:57:24 -04:00
Michael Stenta
3099bb607d Fix sensor settings form ajax. 2017-06-28 14:55:14 -04:00
Michael Stenta
ed829a3ae5 Add sensor data entity View group to ensure it is above other Views. Always show listener data View. 2017-06-28 14:54:49 -04:00
Michael Stenta
e5b5d6f2a9 Put the "History of Assets" View in the "assets" group. 2017-06-28 14:54:49 -04:00
Michael Stenta
32b4ef9309 Invoke a hook for modules to provide their own entity View groups. 2017-06-28 14:54:49 -04:00
Michael Stenta
2a2c3f794d Wrap entity View groups in a fieldset. 2017-06-28 12:49:26 -04:00
Michael Stenta
d3f5480542 Add ability to group entity Views into assets, logs, or other. 2017-06-28 12:44:58 -04:00
Michael Stenta
186ba38aea Rearrange functions in farm_ui.module: hooks on the top, helper functions on the bottom. 2017-06-28 12:11:14 -04:00
Michael Stenta
665105ff62 Move entityreference_view_widget code to helper function in farm_ui.views.inc. 2017-06-28 12:10:35 -04:00
Michael Stenta
3005ccf5b1 Move entity Views code to farm_ui.entity_views.inc. 2017-06-28 12:10:35 -04:00
Michael Stenta
6fb35cad87 Move breadcrumb code to farm_ui.breadcrumb.inc. 2017-06-28 12:10:35 -04:00
Michael Stenta
c5d7f77f96 Move action link code to farm_ui.action_links.inc. 2017-06-28 12:10:35 -04:00
Michael Stenta
8e6411511e Implement hook_hook_info() in farm_ui module. Move implementations to farm_ui.farm_ui.inc. 2017-06-28 12:10:35 -04:00
Michael Stenta
a011057aa9 Move Farm UI hook_views_post_render() logic to helper function in farm_ui.views.inc. 2017-06-28 12:10:03 -04:00
Michael Stenta
ab1bf9821e Move Farm UI hook_farm_area_details() to farm_ui.farm_area.inc. 2017-06-28 11:41:58 -04:00
Michael Stenta
3eeacb2552 Implement hook_hook_info() in farm_area module. Move implementations to farm_area.farm_area.inc. 2017-06-28 11:41:52 -04:00
Michael Stenta
4018c3b7bb Implement hook_hook_info() in farm_access module. Move implementations to farm_access.farm_access.inc. 2017-06-28 11:35:36 -04:00
Michael Stenta
9c4ac0a1eb Remove duplicate "Add area" action link. 2017-06-28 10:27:44 -04:00
Michael Stenta
6488ea3c51 Move remaining farm_admin code to new farm_dashboard module. Delete farm_admin module. 2017-06-28 08:20:56 -04:00
Michael Stenta
851fb9fe46 Move farm menu code from farm_admin to new farm_menu module. 2017-06-27 15:54:47 -04:00
Michael Stenta
c73b27852f Remove hook_navbar() from farm_admin. 2017-06-27 15:43:02 -04:00
Michael Stenta
d10bfa60b8 Move hook_menu_breadcrumb_alter() from farm_admin to farm_ui. 2017-06-27 15:42:47 -04:00
Michael Stenta
610784d38f Move farmOS help page code to new farm_help module. 2017-06-27 15:39:31 -04:00
Michael Stenta
5b3ba071e5 Use entity weight for ordering action links. 2017-06-27 15:39:31 -04:00
Michael Stenta
e6168c3d3b Static cache the entity UI info gathered by farm_ui_entities(). 2017-06-27 15:39:31 -04:00
Michael Stenta
0377bde476 Fix: crop families are not directly related to plantings assets. 2017-06-27 15:39:31 -04:00
Michael Stenta
411dd57e53 Automatically add asset Views to other taxonomy terms provided by modules. 2017-06-27 15:39:31 -04:00
Michael Stenta
913e499e72 Automatically add movements View to all assets. 2017-06-27 15:39:31 -04:00
Michael Stenta
fa31b85145 Automatically add children View to all assets (will only display if children exist). 2017-06-27 15:39:31 -04:00
Michael Stenta
e4971aff05 Automatically generate a list of log Views to display on areas. 2017-06-27 15:39:31 -04:00
Michael Stenta
3120539ca7 Use the new area argument position function in farm_ui_area_links(). 2017-06-27 15:39:31 -04:00
Michael Stenta
0ded4a4408 Add a function that encapsulates logic for figuring out where the area ID argument is in a View. 2017-06-27 15:39:31 -04:00
Michael Stenta
fc5d645ec6 Automatically generate a list of asset Views to display on areas. 2017-06-27 15:39:31 -04:00
Michael Stenta
3f16718b4a Merge hook_farm_ui_asset_views() and hook_farm_ui_taxonomy_views(). 2017-06-27 15:39:31 -04:00
Michael Stenta
d644e54b6d Reorder logs so that they are roughly in the order that they will typically take place on an entity. 2017-06-27 15:39:31 -04:00
Michael Stenta
642e1187e1 Automatically generate a list of log Views to display on assets. 2017-06-27 15:39:31 -04:00
Michael Stenta
330872e802 Consolidate code for adding Views to asset and taxonomy pages. 2017-06-27 15:39:31 -04:00
Michael Stenta
0fb73ffcad Move hooks for adding Views to asset and term pages to farm_ui module. 2017-06-27 15:39:31 -04:00
Michael Stenta
e3e8ddddbe Minor change to Farm UI module description. 2017-06-27 15:39:31 -04:00
Michael Stenta
2a185e5133 Consolidate all asset cluster map rendering into farm_ui module. 2017-06-27 15:39:30 -04:00
Michael Stenta
4f049c6009 Simplify area link generation and split asset and log lists. 2017-06-27 15:39:30 -04:00
Michael Stenta
5e5fac71d9 Move all area link generation logic to farm_ui module and remove hook_farm_area_links(). 2017-06-27 15:39:30 -04:00
Michael Stenta
6784b97bd3 Consolidate common area link generation code. 2017-06-27 15:39:30 -04:00
Michael Stenta
51f5cb906e Add area links for some log types. 2017-06-27 15:39:30 -04:00
Michael Stenta
ee811350e3 Automatically generate area links for all asset types. 2017-06-27 15:39:30 -04:00
Michael Stenta
1073d8c613 Rename _farm_ui_action_link() to farm_ui_action_link(). 2017-06-27 15:39:30 -04:00
Michael Stenta
0060a95262 Remove hook_farm_ui_actions() because farm_ui is the only module implementing it now. 2017-06-27 15:39:30 -04:00
Michael Stenta
43ffaca789 Add action links to area pages. 2017-06-27 15:39:30 -04:00
Michael Stenta
b9688b40d3 Only apply allowed asset reference type handling to the View: farm_asset_entityreference_view 2017-06-27 15:39:30 -04:00
Michael Stenta
386e967317 Automate allowed asset reference type handling so that hook_farm_ui_allowed_asset_reference_type() is no longer necessary. 2017-06-27 15:39:30 -04:00
Michael Stenta
01710232b4 Move allowed asset reference type handling from farm_log to farm_ui. 2017-06-27 15:39:30 -04:00
Michael Stenta
9130864f89 Add log action links to asset view pages. 2017-06-27 15:39:30 -04:00
Michael Stenta
8a83ed5791 Build breadcrumbs and action links for log entities in farm_ui module. 2017-06-27 15:39:30 -04:00
Michael Stenta
9b3fc109cc Remove "a"/"an" from default farm action links for consistency. 2017-06-27 15:39:30 -04:00
Michael Stenta
7b5c9f4358 Generalize entity action link creation to work for all entity types. 2017-06-27 15:39:30 -04:00
Michael Stenta
cc7ce2b21d Use entity UI info to build breadcrumbs instead of hook_farm_ui_taxonomy_breadcrumb(). 2017-06-27 15:39:30 -04:00
Michael Stenta
e7e5aa935f Add comments to hook_farm_ui_entities() in farm_ui.api.php. 2017-06-27 15:39:30 -04:00
Michael Stenta
f0fc9e170e Move taxonomy breadcrumb handling into farm_ui module. 2017-06-27 15:39:30 -04:00
Michael Stenta
e6e34b4d9d Refactor farm_ui_entity_view() breadcrumb code to make room for more entity types. 2017-06-27 15:39:30 -04:00
Michael Stenta
4718a89963 For each asset type, create an action link on its listing page. 2017-06-27 15:39:30 -04:00
Michael Stenta
10112e66c3 Use entity UI info to build breadcrumbs instead of hook_farm_ui_asset_breadcrumb(). 2017-06-27 15:39:30 -04:00
Michael Stenta
f04e6b62fa Add hook_farm_ui_entities() for modules to define farmOS entity UI information. 2017-06-27 15:39:30 -04:00
Michael Stenta
8c69f16503 Move asset breadcrumb handling to farm_ui module. 2017-06-27 15:39:30 -04:00
Michael Stenta
ab8562fed6 Split farm_people View out into new farm_people module. 2017-06-27 15:39:30 -04:00
Michael Stenta
9fe05a18b2 Consolidate area, asset, log, and user action links into farm_ui module. 2017-06-27 15:39:30 -04:00
Michael Stenta
e03d661475 Move user and role_delegation perms from farm_admin to farm_access. 2017-06-27 15:39:29 -04:00
Michael Stenta
e6d3d55d04 Remove 'view farm logs' permission in favor of 'view all logs'. 2017-06-27 15:39:29 -04:00
Michael Stenta
53be651d85 Further consolidate default asset, log, and term access perms into farm_access module itself. 2017-06-27 15:39:29 -04:00
Michael Stenta
da33181cd1 Consolidate default taxonomy term CRUD permissions for all vocabularies in farm_taxonomy.module. 2017-06-27 15:39:29 -04:00
Michael Stenta
930c8a2cc9 Consolidate default log CRUD permissions for all log types in farm_log.module. 2017-06-27 15:39:29 -04:00
Michael Stenta
3f6b77ef6a Consolidate default asset CRUD permissions for all asset types in farm_asset.module. 2017-06-27 15:39:29 -04:00
Michael Stenta
449a465c98 Move hook_farm_admin_actions() to new farm_ui module as hook_farm_ui_action(). 2017-06-27 15:39:29 -04:00
Michael Stenta
6f34c8f98f Change argument title override in Observations view so it looks better in breadcrumbs. 2017-06-26 17:06:00 -04:00
Michael Stenta
075bbd4e4e Fix compost: don't always display compost View. 2017-06-26 17:05:46 -04:00
Michael Stenta
20cbf131d7 Fix movement relationship in Seeding and Transplanting Views. 2017-06-26 10:07:55 -04:00
Michael Stenta
a8d135995f Change all instances of 'page_1' to 'page' in Views. 2017-06-26 10:07:46 -04:00
Michael Stenta
28ee2e6b2e Allow user to specify whether the seeding/transplanting is done. 2017-06-24 12:20:17 -04:00
Michael Stenta
a616ba4168 When a log is created, display a message with a link to it. 2017-06-24 12:20:17 -04:00
Michael Stenta
161bcd3baf Add a submit function for generating seeding/transplanting log when creating a planting. 2017-06-24 12:20:17 -04:00
Michael Stenta
9fb859261d Allow log done status to be specified as a parameter. 2017-06-24 12:20:17 -04:00
Michael Stenta
027af116ee Make the areas parameter optional in farm_log_movement_create(). 2017-06-24 12:20:17 -04:00
Michael Stenta
6ff1e40bcb Split area name string parsing out to a separate function so it can be reused. 2017-06-24 12:20:17 -04:00
Michael Stenta
f6ddb39e16 Generalize the function for creating a movement log so that it can be used to create other log types beyond observations. 2017-06-24 12:20:17 -04:00
Michael Stenta
01202b4155 Only show the "Plan" fieldset when adding a new planting. 2017-06-24 12:20:16 -04:00
Michael Stenta
ec024fd362 Initial sketch of the "Plan" fields in the planting edit form. 2017-06-24 12:20:16 -04:00
Michael Stenta
62e439631b Fix water test CSV display attachment. 2017-06-22 15:47:05 -04:00
Michael Stenta
6af9a5edb3 Don't always show sensor View on area pages. 2017-06-22 15:46:54 -04:00