categories fix

dmd-web-and-mobile · Mar 23, 2017 · 3714c0a · 3714c0a
1 parent e37de7e
commit 3714c0a
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 42 deletions.
diff --git a/app/pages/categories/style.styl b/app/pages/categories/style.styl
@@ -11,19 +11,3 @@
 select {
 	display:block!important;
 }
-
-.row
-	display flex
-.catsWrap
-	max-width 100%
-	min-width 100%
-	+above(700px)
-		min-width: 680px
-	margin 0 auto
-.rulesWrap
-	display flex
-	flex-wrap wrap
-	.card
-		flex-grow 1
-		margin 1em
-		max-width calc(50% - 2em)
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
@@ -1,43 +1,86 @@
 <div class="container">
 	<div class="row">
-		<div class="catsWrap">
+		<div class="col s12 m9">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
-
-
-
 		      <div class="collapsible-header">{{ category.name }}</div>
 		      <div class="collapsible-body">
-
-							<div class="row s12">
-										<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
-										<button class="btn green" ng-click="saveData(category)">Save</button>
-							</div>
-
-							<div class="rulesWrap">
-							<div class="card s6" ng-repeat="rule in category.rules[0]">
-							<div class="card-content">
-	              		<select><option ng-repeat="nutrient in nutrients" value="asdf" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option></select>
-	              		<select><option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option></select>
-	              		<select><option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option></select>
-	              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
-	              		<select><option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option></select>
-	              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
-							</div>
-							</div>
+						<div class="row">
+							<!--<div class="col s12">
+								<div class="input-field col s6">
+				          <input placeholder="Placeholder" id="first_name" type="text" class="validate" ng-model="category.name">
+				          <label for="first_name">Category Name</label>
+				        </div>
+								<button class="btn grey" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
+							</div>-->
+							<div class="col s6" ng-repeat="rule in category.rules[0]">
+								<div class="card">
+			            <div class="card-content">
+			              <div class="row">
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="nutrient in nutrients" value="{{nutrient.name}}" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+													<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
+												</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+			              			<option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
+			              	</div>
+			              </div>		
+			            </div>
+			          </div>
 							</div>
+					    <div class="col s12">
+
+
+
+								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
+								<button class="btn green" ng-click="saveData(category)">Save</button>
+					    </div>
+					  </div>
 					</div>
-
-
-
-
 		    </li>
 		  </ul>
+			<!--<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>-->
 		</div>
+		<!--<div class="col s12 m3">
+			<div class="card grey darken-3">
+				<div class="card-content white-text">
+					<span class="card-title">Filter</span>
+					<div class="row">
+						<div class="col s12">
+				      <div class="row">
+				        <div class="input-field col s12 ">
+				          <input id="by-name" type="text">
+				          <label for="by-name">By Name</label>
+				        </div>
+				      </div>
+
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>-->
 	</div>
 </div>
 
-
 <script>
 function UpdateTextFields() {
 	setTimeout(function() {