Commit Review

.gitignore

@@ -0,0 +1 @@
+.apex

aura/sdg/sdg.cmp

@@ -161,18 +161,14 @@
                 </aura:set>
                 <aura:renderIf isTrue="{!v.ShowFilters}">
                     <div class="slds-p-bottom_small">
-                        <lightning:layout multipleRows="true">
                             <aura:iteration items="{!v.SDGFiltersDefinition}" var="field">
-                                <lightning:layoutItem flexibility="auto" size="{!v.filtersize}">
                                     <div class="{! 'filter ' + v.TargetSize}">
                                         <c:sdgFilter aura:id="cmpFilter" SDGField="{!field}">
 
                                         </c:sdgFilter>
                                     </div>
-                                </lightning:layoutItem>
                             </aura:iteration>
 
-                        </lightning:layout>
                     </div>
                 </aura:renderIf>
 

aura/sdg/sdg.css

@@ -172,7 +172,7 @@ font-size:0.9em;
 
 }
 .THIS .filter{
-width:100%;
+    display: inline-block;
 }
 
 .THIS .slds-table.narrow tr {

aura/sdg/sdgHelper.js

@@ -83,7 +83,7 @@
 
             for (var i = 0; i < fieldlistlength; i++) {
               var field = fields[i];
-              if (field.canFilter) hasFilters === true;
+              if (field.canFilter) hasFilters = true;
               if (
                 field.FieldStyle &&
                 field.FieldStyle.startsWith("Summarize")

aura/sdgFilter/sdgFilter.cmp

@@ -60,8 +60,8 @@
                 <div class="slds-grid slds-wrap">
 
                     <aura:if isTrue="{!v.isString}">
-                        <div class="slds-col slds-col_padded">
-                            <lightning:select aura:id="StringOperatorField" value="{!v.FilterOperatorPreference}" label="{!v.SDGField.Label}" onchange="{!c.updateString}">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
+                            <lightning:select aura:id="StringOperatorField" label="{!v.SDGField.Label}" value="{!v.FilterOperatorPreference}" onchange="{!c.updateString}">
                                 <option text="=" label="{!v.sdgEquals}" />
                                 <option value="NOT=" label="{!v.sdgNotEquals}" />
                                 <option value="STARTS" label="{!v.sdgStarts}" selected="true" />
@@ -70,15 +70,15 @@
                                 <option value="NOTCONTAINS" label="{!v.sdgNotContains}" />
                             </lightning:select>
 
-                        </div>
-                        <div class="slds-col slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
-                            <ui:inputText change="{!c.updateString}" aura:id="StringField" value="{!v.FilterValuePreference}" />
+                            <div class="slds-col slds-grow sdg-filter-input-text">
+                                <label class="slds-hide">&nbsp;</label>
+                                <ui:inputText change="{!c.updateString}" aura:id="StringField" value="{!v.FilterValuePreference}" />
+                            </div>
                         </div>
                     </aura:if>
 
                     <aura:if isTrue="{!v.isDate}">
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
                             <lightning:select aura:id="DateOperatorField" label="{!v.SDGField.Label}" value="{!v.FilterOperatorPreference}" onchange="{!c.updateDate}">
                                 <option text="=" label="{!v.sdgEquals}" />
                                 <option text="GT" label="{!v.sdgAfter}" />
@@ -101,9 +101,7 @@
                                 <option text="LAST_YEAR" label="{!v.sdgLastYear}" />
                             </lightning:select>
 
-                        </div>
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
+                            <label class="slds-hide">&nbsp;</label>
                             <ui:inputDate aura:id="DateField" change="{!c.updateDate}" value="{!v.DateValue}" displayDatePicker="true" />
                         </div>
 
@@ -130,18 +128,19 @@
 
 
                     <aura:if isTrue="{!v.isNumber}">
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
 
                             <lightning:select aura:id="NumberOperatorField" label="{!v.SDGField.Label}" value="{!v.NumberOperator}" onchange="{!c.updateNumber}">
                                 <option text="=" label="{!v.sdgEquals}" />
                                 <option text="GT" label="{!v.sdgGreaterThan}" />
                                 <option text="LT" label="{!v.sdgLessThan}" />
 
                             </lightning:select>
-                        </div>
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
-                            <ui:inputNumber aura:id="NumberField" value="{!v.FilterValuePreference}" change="{!c.updateNumber}" />
+
+                            <div class="slds-col slds-grow sdg-filter-input-number">
+                                <label class="slds-hide">&nbsp;</label>
+                                <ui:inputNumber aura:id="NumberField" value="{!v.FilterValuePreference}" change="{!c.updateNumber}" />
+                            </div>
                         </div>
                     </aura:if>
                 </div>

aura/sdgFilter/sdgFilter.css

@@ -1,3 +1,48 @@
-.THIS .filter_label {
-    text-align: left;
+.THIS .slds-form-element__label {
+    display: block;
 }
+
+.THIS .slds-form-element__control, .THIS .slds-form-element, .THIS .slds-select_container, .THIS div.uiInput {
+    display: inline-block;
+}
+
+.THIS .uiInputText.input, .THIS .uiInputNumber.input, .THIS .uiInputDate .input {
+    border-radius: 0 .25rem .25em 0;
+}
+
+.THIS div.uiInputDate {
+    -webkit-box-flex: 1;
+    -webkit-flex-grow: 1;
+    -ms-flex-positive: 1;
+    flex-grow: 1;
+}
+
+.THIS .sdg-combo-filter .slds-select {
+    border-radius: .25rem 0 0 .25em;
+}
+
+.THIS .slds-select {
+    height: 36px;
+}
+
+.THIS .sdg-combo-filter {
+    position: relative;
+    padding-top: 1.7em;
+}
+
+.THIS .sdg-combo-filter label {
+    position: absolute;
+    top: -1.7em;
+}
+
+.THIS .sdg-filter-input-text {
+    min-width: 200px;
+}
+
+.THIS .sdg-filter-input-number {
+    min-width: 176px;
+}
+
+.THIS .uiInput--datetime .datePicker-openIcon {
+    bottom: 11px;
+}

classes/sdgQueryBuilder.cls

@@ -30,7 +30,7 @@ global static string BuildFilterClause(String ColumnName, String FieldType, Stri
     if (string.isblank(filteroperator))
             filteroperator = '=';
 
-            if (FieldType ==String.valueof(Schema.DisplayType.STRING))
+            if (FieldType ==String.valueof(Schema.DisplayType.STRING) || FieldType ==String.valueof(Schema.DisplayType.EMAIL))
             {
                 if (String.isNotBlank(filtervalue.trim()))
                 {

labels/CustomLabels.labels

@@ -46,8 +46,8 @@
         <fullName>sdgFalse</fullName>
         <language>en_US</language>
         <protected>false</protected>
-        <shortDescription>False</shortDescription>
-        <value>False</value>
+        <shortDescription>No</shortDescription>
+        <value>No</value>
     </labels>
     <labels>
         <fullName>sdgFiltered</fullName>
@@ -228,8 +228,8 @@
         <fullName>sdgTrue</fullName>
         <language>en_US</language>
         <protected>false</protected>
-        <shortDescription>True</shortDescription>
-        <value>True</value>
+        <shortDescription>Yes</shortDescription>
+        <value>Yes</value>
     </labels>
     <labels>
         <fullName>sdgView_All</fullName>