Skip to content

Commit

Permalink
Merge pull request #244 from Chicago/ms120
Browse files Browse the repository at this point in the history 
Milestone 1.2.0 changes
  • Loading branch information
@rladines
rladines authored Sep 8, 2016
2 parents a575f9d + b1c9a35 commit 5b969af
Show file tree
Hide file tree
Showing 13 changed files with 445 additions and 63 deletions.
49 changes: 38 additions & 11 deletions lib/jquery-1.11.2/opengrid-query-builder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@
add_group: 'glyphicon glyphicon-plus-sign',
add_rule: 'glyphicon glyphicon-plus',
remove_group: 'glyphicon glyphicon-remove',
remove_rule: 'glyphicon glyphicon-remove',
//OpenGrid customization
remove_rule: 'glyphicon glyphicon-remove-circle',
error: 'glyphicon glyphicon-warning-sign'
}
};
Expand Down Expand Up @@ -1355,6 +1356,20 @@
return false;
};

QueryBuilder.prototype.isNaturalLangChronoTimeValue = function(value) {
var o = chrono.parse(value);
if (o.length > 0) {
var v = o[0];
if (v.tags) {
if (v.tags.ENTimeAgoFormatParser)
return true;
else
return false;
}
}
return false;
};


/**
* Returns an incremented group ID
Expand Down Expand Up @@ -2726,20 +2741,23 @@


_getRuleValue: function(rule) {

//OpenGrid extension, translate system rule value
if (rule.type === 'date') {
//OpenGrid extension, translate system rule value
if (this.isNaturalLangChronoValue(rule.value) ) {
//map to Mongo's current date time token
//this does not work for datetime values stored as numeric
//rule.value = '$currentDate';

//assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
return moment(chrono.parseDate(rule.value)).startOf('day').valueOf();
if (this.isNaturalLangChronoTimeValue(rule.value))
//include time value
return moment(chrono.parseDate(rule.value)).valueOf();
else
//start of day (assume > to be only operator)
return moment(chrono.parseDate(rule.value)).startOf('day').valueOf();
} else
return moment(rule.value, "MM/DD/YYYY hh:mm:ss a").valueOf();
} else
return rule.value;

},

//assume only 'between' operator can be applied
Expand All @@ -2748,10 +2766,18 @@
//map to Mongo's current date time token

//assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
if (i==1)
value = moment(chrono.parseDate(value)).endOf('day').valueOf();
else
value = moment(chrono.parseDate(value)).startOf('day').valueOf();
if (this.isNaturalLangChronoTimeValue(value)) {
//include time value, e.g. 5 hours ago, 30 minutes ago, etc
value = moment(chrono.parseDate(value)).valueOf();
} else {
//between operation
if (i==1)
//2nd argument, use end of day time
value = moment(chrono.parseDate(value)).startOf('day').add(1, 'day').valueOf();
else
//1st argument, use start of day time
value = moment(chrono.parseDate(value)).startOf('day').valueOf();
}
return value;
} else {
//assume: datetime on target is stored in Mongo as a numeric value representing Unix epoch in ms
Expand Down Expand Up @@ -3527,7 +3553,8 @@
"__author": "Damien \"Mistic\" Sorel, http://www.strangeplanet.fr",
"add_rule": "Add rule",
"add_group": "Add group",
"delete_rule": "Delete",
//OpenGrid customization: removed Delete text
"delete_rule": "",
"delete_group": "Delete",
"conditions": {
"AND": "AND",
Expand Down
71 changes: 66 additions & 5 deletions src/css/ogrid-theme-blue.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ html, body {


.query-builder .rules-group-container {
padding: 10px 10px 6px;
padding: 5px 5px 0px 0px;

border:none !important;
background: none !important;
}
.query-builder .rules-group-container .btn-success {background-color: #28303D !important; border-color:#73C4E1 !important;}
#ogrid-ds-tabs .regtab a {background-color:transparent !important; border:1px #FFFFFF solid !important; border-radius: 10px; }
.query-builder .rules-group-container .btn-danger {color: #28303D; background-color:transparent !important; border-color: #28303D;}
.query-builder .rules-group-container .btn-danger {color: #28303D; background-color:transparent !important; border: none;
font-size: 1.5em;}
#advSearchSave {color:#fff !important; background-color:#28303D !important; border-color:#2E6DA4 !important;}
.query-builder .rules-group-container .btn-danger:hover {opacity: 0.6; }

::-webkit-scrollbar-button:start:decrement,
::-webkit-scrollbar-button:end:increment { height: 0px; display: block; background-color: black;}
Expand Down Expand Up @@ -181,13 +184,25 @@ html, body {
}

#advSearchSubmit, #advSearchReset, #advSearchSave {
width: 100px;
width: 120px;
}


#advSearchSubmit {
margin-left: 10px;
margin-left: 35px;
position: fixed;
bottom: 35px;
}

#advSearchReset {
position: fixed;
bottom: 35px;
margin-left: 165px;
}

.ogrid-color-panel {
padding: 0px 10px 0px 10px !important;
}


#autorefresh-panel .control-label {
Expand Down Expand Up @@ -258,7 +273,10 @@ html, body {
.ogrid-task-pane .rule-value-container .form-control {
font-weight: 300;
}

.ogrid-color-options {
font-size: 12px !important;
text-decoration: underline;
}

div#ogrid-dataset-filters.panel-body, div#ogrid-geo-filters.panel-body {
padding-left: 0px;
Expand All @@ -276,6 +294,17 @@ div#ogrid-dataset-filters.panel-body, div#ogrid-geo-filters.panel-body {
font-size: 152%;
}

.adv-bottom-commandbar {
background-color: #2480a0;
margin-left: -25px;
position: fixed;
bottom: 0px;
height: 80px;
width: 100%;
opacity: 1.0;
z-index: 8000;
}

/* Size when the advanced tabs header breaks */
@media (max-width: 342px) {
#ogrid-adv-tabs a {
Expand Down Expand Up @@ -315,4 +344,36 @@ div#ogrid-dataset-filters.panel-body, div#ogrid-geo-filters.panel-body {
padding-left: 10px;
font-size: 1.5em;
}
}

.header-center {
display: flex;
justify-content: center;
align-items: center;
height: 25px;
margin-right: 0 !important;
margin-top: 0 !important;
}

#ogrid-footer .panel-title a {
padding-top: 0;
padding-bottom: 0;
}

.ogrid-footer-panel {
border-width: 0;
}

.ogrid-footer-panel-heading, .ogrid-footer-panel-heading .panel-title {
color: #fff !important;
background-color: #292e35 !important;
border-width: 0 !important;
}
.ogrid-nav-btn .active {
background-color: rgba(129, 131, 132, 0.97) !important;
}

.leaflet-control-attribution {
/* adjusted due to increase in search results panel height */
margin-bottom: 4px !important;
}
45 changes: 45 additions & 0 deletions src/css/ogrid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,56 @@ h6 > a {
.bootstrap-table .fixed-table-toolbar .columns div[title='Heat Map'] .dropdown-menu {
width: 165px;
}
.map-info {
padding: 6px 8px;
font: 14px/16px Arial, Helvetica, sans-serif;
background: white;
background: rgba(255,255,255,0.8);
box-shadow: 0 0 15px rgba(0,0,0,0.2);
border-radius: 5px;
}
.map-info h4 {
margin: 0 0 5px;
color: #777;
}

.legend {
text-align: left;
line-height: 18px;
color: #555;
}

.legend i {
width: 18px;
height: 18px;
float: left;
margin-right: 8px;
opacity: 0.7;
}

.legend .ogrid-legend-circle {
border-radius: 50%;
width: 10px;
height: 10px;
margin-top: 4px;
}

.ogrid-logo-small {
width: 32px;
height: 32px;
/*padding-top: 9px;*/
margin-top: 10px;
margin-left: 10px;
}

.glyphicon {
position: relative;
top: 1px;
display: inline-block;
font-family: 'Glyphicons Halflings';
font-style: normal;
font-weight: 400;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
23 changes: 13 additions & 10 deletions src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<div id="ogrid-search" class="pull-left">
<form class="navbar-form " role="search">
<div class="form-group has-feedback input-group" id="qsearch">
<input autocapitalize="off" type="text" class="form-control" id="qsearch-input" placeholder="Quick search" />
<input autocapitalize="off" type="text" class="form-control" id="qsearch-input" placeholder="Find Places, Businesses, etc." />
<span id="ogrid-qsearch-hint" class="glyphicon glyphicon-question-sign" data-toggle="popover" tabindex="0" data-placement="bottom" title="Quick Search Help"></span>
<span class="input-group-addon" id="qsearch-button">
<i class="fa fa-search"></i>
Expand All @@ -67,7 +67,7 @@
<ul class="nav navbar-nav navbar-right">
<li>
<p class="navbar-btn ogrid-nav-btn">
<a id="ogrid-advanced-btn" href="#" class="btn btn-default hide">Advanced Search</a>
<a id="ogrid-advanced-btn" href="#" class="btn btn-default hide">Find Data</a>
</p>
</li>
<li>
Expand Down Expand Up @@ -146,7 +146,7 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading panel-collapsed">Datasets and Standard Filters <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
<div id="ogrid-select-data-pane"class="panel-heading panel-collapsed">Select Data<span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
<div id="ogrid-dataset-filters" class="panel-body" style="display:none">
<ul id="ogrid-ds-tabs" class="nav nav-tabs nav-pills" role="tablist">
<!-- JQuery template -->
Expand All @@ -173,7 +173,9 @@
<div class="tab-pane active" id="${tabName}">
<div id="builder_${tabName}"></div>
<div class="row">
<div class="panel panel-default col-xs-12">
<div class="panel panel-default col-xs-12 ogrid-color-panel">
<div id="colorOptions_${tabName}" class="panel-heading ogrid-color-options">Color Options <span class="clickable"></span></div>
<div class="panel-body ogrid-color-options-panel-body" style="display:none">
<form class="form-inline form-in-panel">
<div class="form-group">
<label for="colorPicker" class="control-label">Color</label>
Expand Down Expand Up @@ -222,6 +224,7 @@
</div>
</div>
</form>
</div>
</div>
</div>
</div>
Expand All @@ -230,7 +233,7 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading panel-collapsed">Additional/Geo-spatial Filters <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
<div class="panel-heading panel-collapsed">Select Location <span class="clickable panel-collapsed"><i class="glyphicon glyphicon-chevron-down"></i></span></div>
<div id="ogrid-geo-filters" class="panel-body" style="display:none">
<div id="geo-filter"></div>
</div>
Expand Down Expand Up @@ -266,9 +269,9 @@
</div>
</div>
</div>
<div class="pull-left">
<button id="advSearchSubmit" type="button" class="btn btn-primary">Submit</button>
<button id="advSearchReset" type="button" class="btn btn-default">Reset</button>
<div class="pull-left adv-bottom-commandbar">
<button id="advSearchSubmit" type="button" class="btn btn-primary">Get Data</button>
<button id="advSearchReset" type="button" class="btn btn-default">Clear Search</button>
</div>
</div>
<div class="tab-pane" id="save-queries">
Expand All @@ -279,9 +282,9 @@
</div>
</div>
<div id="ogrid-footer" class="panel-group">
<div class="panel panel-default ogrid-footer-panel ogrid-footer-panel-default">
<div class="panel panel-default ogrid-footer-panel ogrid-footer-panel-default" data-toggle="tooltip" data-placement="top" title="Search results">
<div class="panel-heading ogrid-footer-panel-heading">
<i id="ogrid-panel-caret" class="glyphicon glyphicon-chevron-up pull-right"></i>
<i id="ogrid-panel-caret" class="fa fa-chevron-circle-up fa-lg header-center"></i>
<h6 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#tableview"></a>
</h6>
Expand Down
Loading

0 comments on commit 5b969af

Please sign in to comment.