3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Commit graph

926 commits

Author SHA1 Message Date
Michael Stenta
f3200d50ca Do not grant the "administer users" permission. 2019-02-17 20:00:22 -05:00
Michael Stenta
b7965ef655 Remove role_delegation permissions. 2019-02-17 20:00:22 -05:00
Michael Stenta
c9aad82bde Check action link path validity (including user access). 2019-02-17 20:00:22 -05:00
Michael Stenta
f8d44ba8e4 Remove bulk operations and edit column from /farm/people View. 2019-02-17 20:00:22 -05:00
Jamie Gaehring
598f7ef3fb grant access to files via restws 2019-02-14 17:43:35 -05:00
Michael Stenta
ca898a9ad3 Issue #3032496: SQL syntax error breaking asset type lists (crops/varieties, species/breeds, etc) 2019-02-12 15:56:23 -05:00
Michael Stenta
25921a38da Grant access to the /user.json path for farm roles. 2019-02-07 12:43:27 -05:00
Michael Stenta
e6a87e7112 Fix farm.json endpoint access permission on farm access roles. 2019-02-05 13:01:16 -05:00
Michael Stenta
b30ca150ac Issue #3029581: API endpoint for general farm info 2019-01-30 17:32:37 -05:00
Michael Stenta
b8489b3ac0 Do not allow null timestamp values in sensor data table. 2019-01-26 11:20:24 -05:00
Michael Stenta
a9ba0db61e Issue #2873158: Multiple materials in one input log 2019-01-22 13:01:34 -05:00
Michael Stenta
71a9cd3cd4 Issue #3027067: API can't filter archived assets 2019-01-21 13:19:38 -05:00
Michael Stenta
98d1547729 Fix exported translatables in quantity report view. 2019-01-21 12:44:30 -05:00
Michael Stenta
b3fb37cb11 Add area field and filter to quantity report view. 2019-01-21 12:44:16 -05:00
Michael Stenta
763ae8da6c Add SOURCES.md to cite 2008 RUSLE2 manual for STIR operations. 2019-01-20 15:19:10 -05:00
Michael Stenta
50e12487f9 Move taxonomy_terms_per_page_admin variable to hook_install()+hook_update_N(). 2019-01-14 09:54:51 -05:00
Michael Stenta
dbd395ef66 Issue #3025774: Can't rearrange area hierarchy across multiple pages 2019-01-14 09:31:22 -05:00
Michael Stenta
ad7386e18e Clarify how location is chosen in comment and description. 2019-01-08 15:12:48 -05:00
Michael Stenta
8201836df3 Move implode()s closer together so it's easier to see how the planting name is assembled. 2019-01-08 15:12:04 -05:00
Michael Stenta
a71764d840 Coding standards: whitespace. 2019-01-08 15:10:56 -05:00
Paul Weidner
4102776dff Add location to comment 2019-01-08 11:12:03 -08:00
Paul Weidner
39a84a4db8 Add description to the planting asset name field 2019-01-08 11:09:22 -08:00
Paul Weidner
5846276626 Autofill location in the asset name 2019-01-08 11:09:04 -08:00
Michael Stenta
33937bc2f7 Comments: add punctuation, minor rewording. 2019-01-08 13:33:30 -05:00
Michael Stenta
f6f3c73ade Move $form_values alias to the top and replace other usages. 2019-01-08 13:30:13 -05:00
Paul Weidner
f33dc32ca1 Use the default season that is already stored 2019-01-08 10:00:59 -08:00
Paul Weidner
b041422c0a Fix bug, the input changes were not included with the submitted form. Set the default value, not value. 2019-01-08 09:57:50 -08:00
Paul Weidner
9e4b966b88 Update the planting asset name to be submitted 2019-01-08 09:55:03 -08:00
Paul Weidner
4b85217004 Add callback to the Season and Crop fields to update the Planting Name. 2019-01-08 09:26:46 -08:00
Paul Weidner
f29a527542 Add planting asset name text field 2019-01-07 20:51:30 -08:00
Michael Stenta
3b626aecf5 Use db_query() instead of drupal_write_record() because the table may not be recognized by Drupal yet. 2019-01-07 11:45:57 -05:00
Michael Stenta
a1713b6cf0 Insert NRCS STIR operations into database when installing new sites. 2019-01-07 11:43:16 -05:00
Michael Stenta
f763ac9133 Move code for inserting NRCS STIR operations to a helper function. 2019-01-07 11:41:51 -05:00
Michael Stenta
21201f2602 Fix potential rounding in both amendment and disturbance code. 2019-01-04 14:05:38 -05:00
Michael Stenta
e38e73806e Move area percentage field into area fieldset. 2019-01-04 14:00:51 -05:00
Michael Stenta
5019c90f6b Add descriptions to Activity and STIR fields. 2019-01-04 14:00:38 -05:00
Michael Stenta
1630018c20 Add a field for the STIR value, loaded from activity, saved as a log measurement. 2019-01-04 13:52:16 -05:00
Michael Stenta
165c3b31a5 Add the soil disturbance log to $form_state['storage'] so other submit functions can work with it. 2019-01-04 13:51:52 -05:00
Michael Stenta
248916c599 Alter the "Activity" field in Soil Disturbance quick form to use STIR autocomplete. 2019-01-03 14:37:47 -05:00
Michael Stenta
0713d25e00 Add an autocomplete callback path for looking up STIR operations. 2019-01-03 14:37:47 -05:00
Michael Stenta
7cf0424af3 Use hook_form_FORM_ID_alter() in farm_soil_nrcs.module. 2019-01-03 14:37:47 -05:00
Michael Stenta
eb13015617 Populate the farm_soil_nrcs_stir table from a CSV file. 2019-01-03 14:37:47 -05:00
Michael Stenta
297d4570a8 Add a {farm_soil_nrcs_stir} database table. 2019-01-03 14:37:47 -05:00
Michael Stenta
89fa6ea2ce Add activity field (saved to log title and notes). 2019-01-03 14:37:46 -05:00
Michael Stenta
0f5dba4860 Add fields for entering the total areas size and the percentage of it that was disturbed. 2019-01-03 14:37:46 -05:00
Michael Stenta
e901441e6e Add notes fields (copied from amendment form). 2019-01-03 14:37:46 -05:00
Michael Stenta
ad771f8004 Initial disturbance log creation code (only timestamp and area name). 2019-01-03 14:37:46 -05:00
Michael Stenta
9299054ded Initial blank soil disturbance quick form. 2019-01-03 14:37:46 -05:00
Michael Stenta
077a4e634c Add a "Tillage" log category. 2019-01-03 14:37:46 -05:00
Michael Stenta
959ceffc6c farm_log_create(): truncate log names that are too long automatically. 2019-01-03 14:37:28 -05:00
Michael Stenta
bf4392eda3 Fix example hook_farm_dashboard_panes() implementation. 2019-01-03 13:31:07 -05:00
Michael Stenta
a14d6a5526 Make the planting quick form checkboxes purpose more clear with "Add [type]". 2019-01-03 10:25:30 -05:00
Michael Stenta
e07f160929 Move default roles (Manager, Worker, Viewer) to separate module. 2018-12-27 10:42:37 -05:00
Michael Stenta
72334e1991 Refactor other modules to use high-level access rules instead of explicit roles. 2018-12-27 10:42:37 -05:00
Michael Stenta
fcb3dda0fa Remove redundant quantity term permissions. 2018-12-27 10:42:37 -05:00
Michael Stenta
ef55a893f1 If this role has 'config' access, allow them to administer users. 2018-12-27 10:42:37 -05:00
Michael Stenta
b8b75ff864 Refactor taxonomy_farm_access_perms() to use high-level access rules. 2018-12-27 10:42:37 -05:00
Michael Stenta
0f6373c1e4 Change farm_access_entity_perms() to look for 'taxonomy_term' instead of 'taxonomy'. 2018-12-27 10:42:37 -05:00
Michael Stenta
6a905028e1 Allow all roles to view user profiles. 2018-12-27 10:42:37 -05:00
Michael Stenta
f933727321 Allow all roles with high-level config access to delegate user roles. 2018-12-27 10:42:37 -05:00
Michael Stenta
bb34395d3e Add a helper function for generating entity bundle permissions lists for high-level access rules, and use it for assets, plans, and logs. 2018-12-27 10:42:37 -05:00
Michael Stenta
e9f399d178 Add ability to define high-level access rules in hook_farm_access_roles(). 2018-12-27 10:42:37 -05:00
Michael Stenta
93dfc7214a Simplify farm_access.api.php documentation. 2018-12-27 10:42:37 -05:00
Michael Stenta
3e03174c61 Create an internal machine name for farm access roles. 2018-12-27 10:42:37 -05:00
Michael Stenta
cdbd82dd15 Rename columns in plan consideration table to avoid reserved SQL words. 2018-12-27 09:50:10 -05:00
Michael Stenta
f7d76c25c3 Display area description in area details popup. 2018-12-19 14:13:19 -05:00
Michael Stenta
93539d056d Fix water module installation, enable it by default on new sites, and enable it on existing sites. 2018-12-18 17:31:32 -05:00
Michael Stenta
f22ad02b22 Add the ability to record a harvest log. 2018-12-18 14:31:36 -05:00
Michael Stenta
06b0f58a45 Add quantity field to logs. 2018-12-18 14:31:36 -05:00
Michael Stenta
3bf9050131 Generalize logic from farm_quantity_log_create() into new helper function: farm_quantity_log_add_measurements(). 2018-12-18 14:31:36 -05:00
Michael Stenta
9b4de6a7f9 Collapse log notes field. 2018-12-18 14:31:36 -05:00
Michael Stenta
32da3fc09f Remove old "Plan" fieldset from the planting asset form and add a link to the quick form. 2018-12-18 14:31:36 -05:00
Michael Stenta
fd41604b1f Add seeding and transplanting log fields and processing. 2018-12-18 14:31:36 -05:00
Michael Stenta
af994b7e56 Create separate explicit fields for each crop/variety. 2018-12-18 14:31:36 -05:00
Michael Stenta
54ee4723f6 Planting submit function: create planting with name, season, and crops. 2018-12-18 14:31:36 -05:00
Michael Stenta
708f05ca00 Add fields for defining the planting's season and crop(s), and remember the last-entered season. 2018-12-18 14:31:36 -05:00
Michael Stenta
b8af7f1fe9 Initial planting quick form (skeleton). 2018-12-18 14:31:36 -05:00
Michael Stenta
407ac14870 Fix rounding issue in soil amendment quick form's rate of application calculation. 2018-12-18 13:38:02 -05:00
Michael Stenta
0cd849167e Allow API access to taxonomy vocabulary list. 2018-12-10 10:24:57 -05:00
Michael Stenta
999e9dfdb5 Fix weight sorting for area type options. 2018-12-04 15:19:43 -05:00
Michael Stenta
3165d1cc5f Update farm_area_generate and farm_area_import default area types logic. 2018-12-04 15:19:43 -05:00
Michael Stenta
e7a781a714 Move default livestock area types to new farm_livestock_area_types module. 2018-12-04 15:19:43 -05:00
Michael Stenta
026e90e3a6 Move default crop area types to new farm_crop_area_types module. 2018-12-04 15:19:43 -05:00
Michael Stenta
74c99b0479 Move all default area types (except 'other') to new farm_area_types module. 2018-12-04 15:18:07 -05:00
Michael Stenta
1e69b31bd1 Move water area type to the farm_water module. 2018-12-04 15:18:07 -05:00
Michael Stenta
ea93903b61 Add missing @file to farm_area.farm_area.inc. 2018-12-04 15:12:50 -05:00
Michael Stenta
21c5b4d06e Add an 'other' area type. 2018-12-04 15:12:34 -05:00
Michael Stenta
330afb9771 Allow specifying default area type in KML area importer. 2018-12-04 11:47:47 -05:00
Michael Stenta
08bf55ab07 Fix API access to field collections. 2018-12-01 15:34:49 -05:00
Michael Stenta
4f9fbf6a06 Move Birth and Milk quick forms to separate include files (requires menu rebuild). 2018-11-30 11:51:08 -05:00
Michael Stenta
f8b2a72da8 Add dependency to farm_calendar: log. 2018-11-29 15:05:45 -05:00
Michael Stenta
41ab19cbe0 Add dependency to farm_log: log. 2018-11-29 15:05:45 -05:00
Michael Stenta
e5f31da8b1 Add dependency to farm_group: farm_movement. 2018-11-29 15:05:45 -05:00
Michael Stenta
a7e6b3afac Move farm_theme_preprocess_menu_link() to where it belongs. 2018-11-29 15:05:35 -05:00
Michael Stenta
50c7856b1e Improve help text above area geometry field. 2018-11-14 12:23:58 -05:00
Michael Stenta
9d010f6b94 Improve warning when "Lookup soil names" button is pressed without geodata. 2018-11-14 12:14:21 -05:00
Michael Stenta
ceae1d20fb Add help text to soil test log form. 2018-11-14 12:14:05 -05:00
Michael Stenta
8eee53de2f Add help text to the log timestamp field. 2018-11-14 11:54:03 -05:00
Michael Stenta
f630236dc9 Change farm_log hook_form_alter() to hook_form_FORM_ID_alter(). 2018-11-14 11:46:36 -05:00
Michael Stenta
ffc511a46e Rename "Area generator" to "Bed generator" for UX, with area type set to bed by default. This can be re-generalized in the future. 2018-11-14 11:29:41 -05:00
Michael Stenta
43b632cc76 Add soil amendment quick form. 2018-11-14 11:12:21 -05:00
Michael Stenta
b5afb1d2c3 Add a central helper function that maintains a list of quantity units by measure. 2018-11-14 11:11:42 -05:00
Michael Stenta
c661954e36 Move timezone offset calculation out of for loop. 2018-11-10 09:55:24 -05:00
Michael Stenta
cec49722b0 Remove console.log. 2018-11-10 09:51:36 -05:00
Michael Stenta
174286b876 Apply timezone offset to graphed sensor data. 2018-11-10 09:50:02 -05:00
Michael Stenta
84d31b87b4 Auto populate log owner on presave(), so that API requests are also covered. 2018-11-09 15:46:49 -05:00
Michael Stenta
0364de09bb Wrap "Sample points" field in a fieldset to fix ZoomToSource not firing. 2018-11-09 15:15:41 -05:00
Michael Stenta
6b7a216e58 Change "Farm Format" to "Default format" (less distracting/confusing). 2018-11-09 15:00:28 -05:00
Michael Stenta
b48294b4b0 Fix overridden farm_log_harvest feature. 2018-11-09 00:17:20 -05:00
Michael Stenta
532763ea2e Add a Files column to soil tests View for quickly getting to files. 2018-11-08 14:20:12 -05:00
Michael Stenta
f45252d5b9 Fix missing closing parenthesis (follow up to Issue #2950499: CSV export of sensor data) 2018-11-08 09:44:57 -05:00
Michael Stenta
b72072baf6 Fix assigning flags to areas in bulk (Recoverable fatal error: Argument 1 passed to farm_flags_action() must be an instance of Entity, instance of stdClass given). 2018-11-08 09:41:11 -05:00
Michael Stenta
327603e9b0 Add contextual argument validation to sensor data view and override title. 2018-11-08 09:29:36 -05:00
Michael Stenta
2ca0485624 Issue #2950499: CSV export of sensor data 2018-11-08 09:29:20 -05:00
Michael Stenta
0115db0586 Issue #3011770: Add a setting that allows sensor data to be made public 2018-11-07 15:33:41 -05:00
Michael Stenta
c522dd6485 Issue #2493511: Graph sensor data 2018-11-07 15:33:35 -05:00
Michael Stenta
3e10078bb0 Link to farmOS.org sensor documentation. 2018-11-07 15:33:02 -05:00
Michael Stenta
05d3a82383 Update listener callback docblock. 2018-11-07 15:33:02 -05:00
Michael Stenta
04f6d03d34 Access-Control-Allow-Origin' header to allow pulling this data into other domains. 2018-11-07 15:33:02 -05:00
Michael Stenta
591d07b09b Add start and end timestamp parameters. 2018-11-07 15:33:02 -05:00
Michael Stenta
b10267e6f7 Add limit and offset parameters. 2018-11-03 12:41:41 -04:00
Michael Stenta
1b7c5fb635 Allow filtering by value name via query parameter. 2018-11-03 12:28:11 -04:00
Michael Stenta
9ae5bb5f6b Simplify sensor data query - only pull a single latest value. 2018-11-03 12:22:48 -04:00
Michael Stenta
13b43bd9e6 Explicitly check the request type in listener callback. 2018-11-03 12:05:00 -04:00
Michael Stenta
410e387bdc Move logic for loading sensor data to helper function. 2018-11-03 11:43:49 -04:00
Michael Stenta
79d35877fc Fix PHP Notice: Only variables should be passed by reference 2018-10-31 09:00:53 -04:00
Michael Stenta
371550f4a2 Update custom OLGeocoder control plugin to use BaseInterface instead of ObjectInterface. 2018-10-31 08:53:55 -04:00
Michael Stenta
f01d00e23e Fix farm_map.info Features info. 2018-10-31 08:51:31 -04:00
Michael Stenta
19abe4b032 Wrap dashboard panes in fieldsets. 2018-10-27 08:21:55 -04:00
Michael Stenta
22cb8b280f Refactor dashboard so that modules can implement a hook to add panes. 2018-10-27 08:21:55 -04:00
Michael Stenta
8c4dc07182 Add address geocoder widget to other maps: geofield formatter, areas, assets. 2018-10-10 13:49:56 -04:00
Michael Stenta
1c48067877 Automatically set the page title on quick forms. 2018-10-10 12:16:46 -04:00
Michael Stenta
e9b408119e Link milk logs to the quick form that created them. 2018-10-01 16:27:43 -04:00
Michael Stenta
6e9221f15e Pass farm_area_parse_name() $create parameter into farm_term(). 2018-10-01 16:27:38 -04:00
Michael Stenta
a3f77ec8a7 Wrap farm_quick_entity_link() calls in function_exists() condition. 2018-10-01 15:03:52 -04:00
Michael Stenta
4869de26d1 Oops. Revert "wip soil amendment quick form"
This reverts commit 92f2643a4a.
2018-10-01 14:54:13 -04:00
Michael Stenta
a798e64cd0 Use new farm_term() function where possible. 2018-10-01 14:49:24 -04:00
Michael Stenta
b898a1044f Add new farm_term module with helper function for creating/loading a term. 2018-10-01 14:49:24 -04:00
Michael Stenta
92f2643a4a wip soil amendment quick form 2018-10-01 14:49:24 -04:00
Michael Stenta
341093710e Create a helper function for subjectively defining the relative size of an area measurement. 2018-09-26 14:07:24 -04:00
Michael Stenta
ffe851bb72 Create a helper function that returns the default units for an area measure (with optional relative size). 2018-09-26 14:07:24 -04:00
Michael Stenta
38ac0d6a93 Add a function for calculating the total surface area of multiple areas. 2018-09-26 14:07:24 -04:00
Michael Stenta
a194137a89 Move farm_movement_parse_areas() to farm_area_parse_names(). 2018-09-26 14:07:24 -04:00
Michael Stenta
554ea4eb65 Change grammar of auto-generated location log titles (remove "are" to handle singular). 2018-09-26 14:07:24 -04:00
Michael Stenta
461732abe0 Issue #2999087: Map address lookup 2018-09-12 20:58:53 -04:00
Michael Stenta
5230b22305 Appease Features export diff. 2018-09-10 12:40:35 -04:00
Michael Stenta
96e619bb60 Change Views tag to farm_ledger for sales and purchases. 2018-09-10 12:40:35 -04:00
Michael Stenta
5b457f594b Allow editing of sale log names. 2018-09-10 12:40:35 -04:00
Michael Stenta
6ccdf47121 Issue #2962075: Add a new Purchase log type 2018-09-10 12:39:45 -04:00
Michael Stenta
b7fb426fff Move Sale log to new Farm Ledger module. 2018-09-10 11:09:43 -04:00