5c62368a65
* created Soil Analysis, Water Analysis, Weather and Fertilizer doctype * soil doctype edited and crop doctype added * minor stuff * Land Unit + Leaflet * crop cycle added * Land Unit changes + Crop cycle * autoname for plant_analysis * created Agriculture Task * minor stuff * - deleted agriculture_task - current state after the call * [Agriculture] modified fertilizer doctype to have a link to Item This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes * Added fields to `Water Analysis` doctype - Collection Datetime - Laboratory Testing Datetime - Results Datetime (default to Laboratory Testing Datetime) * Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture` - Created `agriculture task` doctype - added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype - edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module * Recursively reflect child land unit feature changes on parents * fixed feature repition bug * added legeneds to ternary plot * added stuff * changes * fix Task * reverted the Task Doctype to have naming in the form TASK.##### * fixed modifications made to TASK doctype * [dirty commit] added auto create Task from Crop on creation of Crop Cycle * Changed the Crop Cycle Doctype - Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle" - Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle - Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle * [Agriculture Module] Modifications - Created childtable doctype "Pest Detected" - Added childtable "Pest Detected" to Pest - Modified "Agriculture Task" to include "Start Day" and "End Day" of task - Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle * [Agriculture Module] fixed Pest doctype not saving issue * [Agrcilture Module] Changes in Crop Cycle - removed the creation of a master task on creation of a new crop cycle - temporary fix to add the pest tasks from the pests added in crop cycle * land_unit_tree.js fields modified to have field objects instead of just field names * Revert "land_unit_tree.js modified" * land_unit_tree.js fields modified to have field objects instead of just field names * [Agriculture Domain] Converted Agriculture Module to a Domain - Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype - Agriculture (alpha) is now a Domain * land_unit area aggregation enabled * land_unit.py checks feature diff for every ancestor and not just the parent * Removed unnecessary print messages * agriculture.py modified to include fixtures * fixtures added to setup.py inside agriculture module * [Agriculture Domain] UI tests added - 'materials' table renamed to 'materials_required' in 'Crop' - wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture - moved creation of tasks from client side to server side in Crop Cycle - Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively - company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms' * [Agriculture Domain] Mostly written server side tests and moved client side code to server side - moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture, - wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest - NOTE: none of the server side codes were tested * [Agriculture Domain] All server side tests working locally * [Agriculture Domain] Testing - added sample test for Land Unit, which needs to be modified to test multiple things - modified tests to be independant of each other * Land Units tests added and area aggregation code migrated to server side * added land_unit server side tests and on_trash added to land_unit * Changing field location for start date * [Agriculture Domain] deleted unnecessary comments * [Agriculture Domain] reverted changes * [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype - Deleted the Pest doctype and replaced it with the more generic Disease doctype - Deleted the Detected Pest doctype and replaced it with Detected Disease doctype * [Agriculture Domain] resolves #11654, resolves #11653 * [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit - not working perfectly yet - docs are fetched but not appended * [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional * [Agriculture] added seperate stage for client side agriculture tests * [Agriculture] minor modification to crop_cycle.js test * [Agriculture] fixed tests * upgrade chromedriver in .travis.yml from 2.32 to 2.33 * [Agriculture] added land unit ui test * [Agriculture] added Agriculture server side test as a seperate stage in travis * tesing travis.yml * [Agriculture] Crop Cycle is able to fetch linked analysis docs * Modified travis.yml for modular server side testing * [minor fix][Agriculture] in soil_texture - fixed multiple soil_texture ternary plot creation on refresh - fixed error on soil composition change * Update .travis.yml * removed location field from linked doctypes * minor fixes and cleanup of agri * minor fix in agriculture and domain patches * permissions added to agriculture - Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes * [Agriculture] - Created Agiculture Analysis Criteria and added sample records to it - All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria - Also Fertilizer does the same This was introduced so that, new parameters could be added on demand * minor changes requested in Agriculture * minor changes * minor fix * Update desktop.py * Update .travis.yml
316 lines
6.4 KiB
CSS
Executable File
316 lines
6.4 KiB
CSS
Executable File
/* ================================================================== */
|
|
|
|
|
|
/* Toolbars
|
|
/* ================================================================== */
|
|
|
|
.leaflet-draw-section {
|
|
position: relative;
|
|
}
|
|
|
|
.leaflet-draw-toolbar {
|
|
margin-top: 12px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar-top {
|
|
margin-top: 0;
|
|
}
|
|
|
|
.leaflet-draw-toolbar-notop a:first-child {
|
|
border-top-right-radius: 0;
|
|
}
|
|
|
|
.leaflet-draw-toolbar-nobottom a:last-child {
|
|
border-bottom-right-radius: 0;
|
|
}
|
|
|
|
.leaflet-draw-toolbar a {
|
|
background-image: url('assets/erpnext/images/leaflet/spritesheet.png');
|
|
background-repeat: no-repeat;
|
|
}
|
|
|
|
.leaflet-retina .leaflet-draw-toolbar a {
|
|
background-image: url('assets/erpnext/images/leaflet/spritesheet-2x.png');
|
|
background-size: 270px 30px;
|
|
}
|
|
|
|
.leaflet-draw a {
|
|
display: block;
|
|
text-align: center;
|
|
text-decoration: none;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Toolbar actions menu
|
|
/* ================================================================== */
|
|
|
|
.leaflet-draw-actions {
|
|
display: none;
|
|
list-style: none;
|
|
margin: 0;
|
|
padding: 0;
|
|
position: absolute;
|
|
left: 26px;
|
|
/* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */
|
|
top: 0;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
.leaflet-right .leaflet-draw-actions {
|
|
right: 26px;
|
|
left: auto;
|
|
}
|
|
|
|
.leaflet-draw-actions li {
|
|
display: inline-block;
|
|
}
|
|
|
|
.leaflet-draw-actions li:first-child a {
|
|
border-left: none;
|
|
}
|
|
|
|
.leaflet-draw-actions li:last-child a {
|
|
-webkit-border-radius: 0 4px 4px 0;
|
|
border-radius: 0 4px 4px 0;
|
|
}
|
|
|
|
.leaflet-right .leaflet-draw-actions li:last-child a {
|
|
-webkit-border-radius: 0;
|
|
border-radius: 0;
|
|
}
|
|
|
|
.leaflet-right .leaflet-draw-actions li:first-child a {
|
|
-webkit-border-radius: 4px 0 0 4px;
|
|
border-radius: 4px 0 0 4px;
|
|
}
|
|
|
|
.leaflet-draw-actions a {
|
|
background-color: #919187;
|
|
border-left: 1px solid #AAA;
|
|
color: #FFF;
|
|
font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif;
|
|
line-height: 28px;
|
|
text-decoration: none;
|
|
padding-left: 10px;
|
|
padding-right: 10px;
|
|
height: 28px;
|
|
}
|
|
|
|
.leaflet-draw-actions-bottom {
|
|
margin-top: 0;
|
|
}
|
|
|
|
.leaflet-draw-actions-top {
|
|
margin-top: 1px;
|
|
}
|
|
|
|
.leaflet-draw-actions-top a,
|
|
.leaflet-draw-actions-bottom a {
|
|
height: 27px;
|
|
line-height: 27px;
|
|
}
|
|
|
|
.leaflet-draw-actions a:hover {
|
|
background-color: #A0A098;
|
|
}
|
|
|
|
.leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
|
|
height: 26px;
|
|
line-height: 26px;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Draw toolbar
|
|
/* ================================================================== */
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-draw-polyline {
|
|
background-position: -2px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-draw-polygon {
|
|
background-position: -31px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
|
|
background-position: -62px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-draw-circle {
|
|
background-position: -92px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-draw-marker {
|
|
background-position: -122px -2px;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Edit toolbar
|
|
/* ================================================================== */
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-edit-edit {
|
|
background-position: -152px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-edit-remove {
|
|
background-position: -182px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled {
|
|
background-position: -212px -2px;
|
|
}
|
|
|
|
.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled {
|
|
background-position: -242px -2px;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Drawing styles
|
|
/* ================================================================== */
|
|
|
|
.leaflet-mouse-marker {
|
|
background-color: #fff;
|
|
cursor: crosshair;
|
|
}
|
|
|
|
.leaflet-draw-tooltip {
|
|
background: rgb(54, 54, 54);
|
|
background: rgba(0, 0, 0, 0.5);
|
|
border: 1px solid transparent;
|
|
-webkit-border-radius: 4px;
|
|
border-radius: 4px;
|
|
color: #fff;
|
|
font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;
|
|
margin-left: 20px;
|
|
margin-top: -21px;
|
|
padding: 4px 8px;
|
|
position: absolute;
|
|
visibility: hidden;
|
|
white-space: nowrap;
|
|
z-index: 6;
|
|
}
|
|
|
|
.leaflet-draw-tooltip:before {
|
|
border-right: 6px solid black;
|
|
border-right-color: rgba(0, 0, 0, 0.5);
|
|
border-top: 6px solid transparent;
|
|
border-bottom: 6px solid transparent;
|
|
content: "";
|
|
position: absolute;
|
|
top: 7px;
|
|
left: -7px;
|
|
}
|
|
|
|
.leaflet-error-draw-tooltip {
|
|
background-color: #F2DEDE;
|
|
border: 1px solid #E6B6BD;
|
|
color: #B94A48;
|
|
}
|
|
|
|
.leaflet-error-draw-tooltip:before {
|
|
border-right-color: #E6B6BD;
|
|
}
|
|
|
|
.leaflet-draw-tooltip-single {
|
|
margin-top: -12px
|
|
}
|
|
|
|
.leaflet-draw-tooltip-subtext {
|
|
color: #f8d5e4;
|
|
}
|
|
|
|
.leaflet-draw-guide-dash {
|
|
font-size: 1%;
|
|
opacity: 0.6;
|
|
position: absolute;
|
|
width: 5px;
|
|
height: 5px;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Edit styles
|
|
/* ================================================================== */
|
|
|
|
.leaflet-edit-marker-selected {
|
|
background: rgba(254, 87, 161, 0.1);
|
|
border: 4px dashed rgba(254, 87, 161, 0.6);
|
|
-webkit-border-radius: 4px;
|
|
border-radius: 4px;
|
|
}
|
|
|
|
.leaflet-edit-move {
|
|
cursor: move;
|
|
}
|
|
|
|
.leaflet-edit-resize {
|
|
cursor: pointer;
|
|
}
|
|
|
|
|
|
/* ================================================================== */
|
|
|
|
|
|
/* Old IE styles
|
|
/* ================================================================== */
|
|
|
|
.leaflet-oldie .leaflet-draw-toolbar {
|
|
border: 3px solid #999;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-toolbar a {
|
|
background-color: #eee;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-toolbar a:hover {
|
|
background-color: #fff;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions {
|
|
left: 32px;
|
|
margin-top: 3px;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions li {
|
|
display: inline;
|
|
zoom: 1;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-edit-marker-selected {
|
|
border: 4px dashed #fe93c2;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions a {
|
|
background-color: #999;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions a:hover {
|
|
background-color: #a5a5a5;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions-top a {
|
|
margin-top: 1px;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions-bottom a {
|
|
height: 28px;
|
|
line-height: 28px;
|
|
}
|
|
|
|
.leaflet-oldie .leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
|
|
height: 27px;
|
|
line-height: 27px;
|
|
} |