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

1313 commits

Author SHA1 Message Date
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
Michael Stenta ae7f9dc58d Add UI hooks for Compost assets. 2017-06-22 15:33:59 -04:00
Michael Stenta 73816c9da6 View of Compost assets. 2017-06-22 15:33:59 -04:00
Michael Stenta bf3a3bc4a3 Initial compost asset type module. 2017-06-22 15:33:59 -04:00
Michael Stenta f57b46c0e8 Show a list of sales at the top of all asset pages. 2017-06-21 11:49:27 -04:00
Michael Stenta 4c54146f67 Add sale action link to asset pages and sales view. 2017-06-21 11:49:27 -04:00
Michael Stenta 2f3a17eb0c Implement hook_farm_access_perms() for sale logs. 2017-06-21 11:49:27 -04:00
Michael Stenta e562fd936c View of Sale logs. 2017-06-21 11:49:27 -04:00
Michael Stenta 66d66b135c Initial commit of Farm Log: Sale module. Provides a sale log type. 2017-06-21 11:49:27 -04:00
Michael Stenta 197b81da73 Use farm_area taxonomy machine name instead of vid in View filter. 2017-06-20 09:19:39 -04:00
Michael Stenta a985a6d6be Enable text processing in water test notes field. 2017-06-15 13:01:46 -04:00
Michael Stenta fd3cc92ea5 Fix order of field groups in water test and egg logs. 2017-06-15 13:01:32 -04:00
Michael Stenta 82ed42ee47 Fix farm_water_test dependencies. 2017-06-15 13:00:42 -04:00
Michael Stenta e058e4ba04 Implement UI hooks for water test logs. 2017-06-15 09:40:12 -04:00
Michael Stenta 100b6b9b1f Add View of water test logs. 2017-06-15 09:40:12 -04:00
Michael Stenta 2cd1df638c Provide a water test log type in a farm_water_test submodule. 2017-06-15 09:40:12 -04:00
Michael Stenta ae9069d068 Provide an "Water" log category. 2017-06-15 09:38:08 -04:00
Michael Stenta f6447983eb Initial water module. 2017-06-15 09:38:08 -04:00
Michael Stenta b945025a03 Add a farm people user reference field base for other modules to use. 2017-06-14 10:46:53 -04:00
Michael Stenta 5b9687423c Add a View of logs assigned to specific users at user/%/logs. 2017-06-13 15:55:04 -04:00
Michael Stenta 30d843d3f2 Remove unused contextual filters from farm_log View. 2017-06-13 15:55:04 -04:00
Michael Stenta bd9fd9a45a Add a dependency on farm_fields because farm_log works with some of the fields it provides. 2017-06-13 15:55:04 -04:00
Michael Stenta 559c6a13dc Automatically populate log owner fields with the currently logged in user (if empty). 2017-06-13 15:55:04 -04:00
Michael Stenta b655ea9d3f Minor comment change. 2017-06-13 15:55:04 -04:00
Michael Stenta 6be845f382 Add log owner column, filter, sort to all Views. 2017-06-13 15:55:04 -04:00
Michael Stenta 4ae857bde6 Add "Owner" field and "Assignment" field group to all log types. 2017-06-13 15:55:04 -04:00
Michael Stenta 9eb560568b Add "log owner" user reference field base. 2017-06-13 15:55:04 -04:00
Michael Stenta 9691c49c06 Add an Entity Reference display to the Farm People View. 2017-06-13 15:55:04 -04:00
Michael Stenta e2ece5e63f Issue #2774957: Area popup doesn't work when clean URLs are disabled 2017-06-01 10:39:35 -04:00
Michael Stenta 89aa46a1a1 Issue #2876943: Add "lot number" to harvest and input logs 2017-05-31 15:37:58 -04:00
Michael Stenta 9cfd7953df Issue #2876964: Add "date purchased" field to Inputs 2017-05-31 15:01:18 -04:00
Michael Stenta 6ac72a08c3 Misc Views code updates (mostly translatables). 2017-05-31 15:00:51 -04:00
Michael Stenta 25c405f413 Minor input field label changes for consistency. 2017-05-31 15:00:01 -04:00
Michael Stenta 286bc41550 Change all instances of "Photo(s)" to "Photos". 2017-05-31 14:59:21 -04:00
Michael Stenta f8d581ade7 Remove observation type field and vocabulary. 2017-05-31 09:53:08 -04:00
Michael Stenta 0d3995dc9e Migrate observations types to log categories. 2017-05-31 09:53:08 -04:00
Michael Stenta 34ec1e3729 Remove code for automatically creating/setting General observation type. 2017-05-31 09:53:08 -04:00
Michael Stenta 81852bb7c5 Change observation log type naming pattern to use date instead of type. 2017-05-31 09:53:08 -04:00
Michael Stenta 2955f923f3 Implement hook_farm_log_categories() to provide categories: "Animals", "Plantings", "Equipment", "Sensors", and "Soil". 2017-05-31 09:53:08 -04:00
Michael Stenta d14958853a Translate category names when they are created. 2017-05-31 09:53:08 -04:00
Michael Stenta 02eb474ea3 Add hook_farm_log_categories() for modules to provide log category terms when they are enabled. 2017-05-31 09:53:08 -04:00
Michael Stenta 99bd350b9a Add log category field and filter to various Views. 2017-05-31 09:53:08 -04:00
Michael Stenta f464e7e8a4 Add log category field instance to activity, harvest, input, and observation log types. 2017-05-30 16:02:14 -04:00
Michael Stenta ea8f7851b8 Add a term reference field base for the log category vocabulary. 2017-05-30 16:01:00 -04:00
Michael Stenta 0b7e444802 Add new taxonomy: Farm Log Categories. 2017-05-30 16:01:00 -04:00
Michael Stenta 8dd085dfb1 Issue #2880498 by m.stenta: Notice: Undefined index: sensor_settings in farm_sensor_form_alter() 2017-05-26 10:53:02 -04:00
Michael Stenta 8dc0f15acd Issue #2880459 by m.stenta: Empty history of assets in area 2017-05-26 10:53:02 -04:00
Michael Stenta adaeab141e Issue #2880449 by m.stenta: Access denied on full/centroid asset GeoJSON Views 2017-05-26 10:53:02 -04:00
Michael Stenta a3ac05d10c Delete readme files from all the merged modules and farm_theme (except for some of farm_access/README.md, which is useful to keep). 2017-05-26 10:53:02 -04:00
Michael Stenta ffb63f2c66 Issue #2876992: Merge farmOS repositories into drupal.org/project/farm 2017-05-26 10:51:47 -04:00
Michael Stenta 87e8840f4b Move to modules/farm/farm_tour in preparation for #2876992. 2017-05-26 10:05:10 -04:00
Michael Stenta ac08d46d6f Move to modules/farm/farm_taxonomy in preparation for #2876992. 2017-05-26 10:04:38 -04:00
Michael Stenta 0a02dddf1a Move to modules/farm/farm_soil in preparation for #2876992. 2017-05-26 10:03:53 -04:00
Michael Stenta 7a3b3c4fd2 Move to modules/farm/farm_sensor in preparation for #2876992. 2017-05-26 10:02:48 -04:00
Michael Stenta 375eb0b542 Move to modules/farm/farm_quantity in preparation for #2876992. 2017-05-26 10:02:03 -04:00
Michael Stenta 1dc67cbd6d Move to modules/farm/farm_mapknitter in preparation for #2876992. 2017-05-26 09:58:52 -04:00
Michael Stenta cd773d4efb Move to modules/farm/farm_map in preparation for #2876992. 2017-05-26 09:58:14 -04:00
Michael Stenta bfa1dd4a34 Move to modules/farm/farm_livestock in preparation for #2876992. 2017-05-26 09:57:32 -04:00
Michael Stenta bdbc488c97 Move to modules/farm/farm_fields in preparation for #2876992. 2017-05-26 09:55:17 -04:00
Michael Stenta 4c559c1eaf Move to modules/farm/farm_equipment in preparation for #2876992. 2017-05-26 09:52:57 -04:00
Michael Stenta f6d690a733 Move to modules/farm/farm_crop in preparation for #2876992. 2017-05-26 09:50:22 -04:00
Michael Stenta f79b2d9f76 Move to modules/farm/farm_area in preparation for #2876992. 2017-05-26 09:49:27 -04:00
Michael Stenta 09739b9f4c Move to modules/farm/farm_access in preparation for #2876992. 2017-05-26 09:42:42 -04:00
Michael Stenta a28d6cb180 Move to modules/farm/farm_admin in preparation for #2876992. 2017-05-26 09:42:29 -04:00
Michael Stenta a69ba5f4a4 Move to modules/farm/farm_log in preparation for #2876992. 2017-05-26 09:38:42 -04:00
Michael Stenta 0985b84cf0 Move to modules/farm/farm_asset in preparation for #2876992. 2017-05-26 09:38:29 -04:00