Merge pull request #15 from MangostasUVaTeam/develop

Entrega del prototipo 1
MangostasUVaTeam · Apr 25, 2016 · a57fc7c · a57fc7c
2 parents 916256d + 029ed3d
commit a57fc7c
Show file tree

Hide file tree

Showing 43 changed files with 1,541 additions and 273 deletions.
diff --git a/web/css/home.css b/web/css/home.css
@@ -0,0 +1,89 @@
+/* general styles */
+html, body {
+  height: 100%;
+  width: 100%;
+}
+
+/* padded section */
+.pad-section {
+  padding: 50px 0;
+}
+.pad-section img {
+  width: 100%;
+}
+
+/* vertical-centered text */
+.text-vcenter {
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+.text-vcenter h1 {
+  font-size: 4.5em;
+  font-weight: 700;
+  margin: 0;
+  padding: 0;
+}
+
+/* additional sections */
+#home {
+  background: url(../images/road.jpg) no-repeat center center fixed;
+  background-color: white;
+  display: table;
+  height: 100vh;
+  position: relative;
+  width: 100%;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+}
+
+#about {
+}
+
+#services {
+  background-color: #306d9f;
+  color: #ffffff;
+}
+#services .glyphicon {
+  border: 2px solid #FFFFFF;
+  border-radius: 50%;
+  display: inline-block;
+  font-size: 60px;
+  height: 140px;
+  line-height: 140px;
+  text-align: center;
+  vertical-align: middle;
+  width: 140px;
+}
+
+#information {
+  background: url(../images/truck.jpg) no-repeat center center fixed;
+  display: table;
+  height: 800px;
+  position: relative;
+  width: 100%;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+}
+#information .panel {
+  opacity: 0.85;
+}
+
+#google_map {
+  height: 500px;
+}
+
+footer {
+  padding: 20px 0;
+}
+footer .glyphicon {
+  color: #333333;
+  font-size: 60px;
+}
+footer .glyphicon:hover {
+  color: #306d9f;
+}
diff --git a/web/css/main.css b/web/css/main.css
@@ -1,23 +1,45 @@
 
-
-body {
-    padding-top: 70px;
-    padding-bottom: 40px;
-}
-
 .progress {
   width: 102px;
 
 }
+.map-view{
+    height: 25vh;
+}
 
+.panel {
+    overflow-y: initial !important
+}
 
+.content {
+    background-color: #306d9f;
+}
 
-.form-signin, .form-login {
-  max-width: 330px;
-  padding: 15px;
-  margin: 0 auto;
+main {
+    padding-top: 70px;
+    padding-bottom: 40px;
+    min-height: 100vh;
+    background-color: #fdfdfd;
+}
+
+.envio-encontrado:hover {
+    border-radius: 5px;
+    background-color: #eeeeee;
 }
 
+.panel-title {
+    margin-top: 0;
+    margin-bottom: 0;
+    font-size: 16px;
+    color: inherit;
+    height: 20px;
+  }
+.img-rounded {
+    width: 130px;
+    height: 70px;
+    border: 2px solid;
+  }
+
 h3 {
     display: inline;
 }
@@ -39,3 +61,9 @@ h3 {
 #myNavbar .form-group {
     display: inline;
 }
+
+#table-scroll {
+    height: 40vh;
+    overflow:auto;
+    margin-top:20px;
+}
diff --git a/web/images/default.gif b/web/images/default.gif
diff --git a/web/images/expli-sin-fondo.png b/web/images/expli-sin-fondo.png
diff --git a/web/images/line-chart.png b/web/images/line-chart.png
diff --git a/web/images/logo-sin-fondo.png b/web/images/logo-sin-fondo.png
diff --git a/web/images/pie-chart.jpg b/web/images/pie-chart.jpg
diff --git a/web/images/road.jpg b/web/images/road.jpg
diff --git a/web/images/tomates.jpg b/web/images/tomates.jpg
diff --git a/web/images/truck.jpg b/web/images/truck.jpg
diff --git a/web/includes/assign-delivery.html b/web/includes/assign-delivery.html
@@ -1,15 +1,11 @@
-<div class="modal-body">
-
-    <h1>{{bid.transportista}}</h1>
-    <h1>{{bid.precio |currency}}</h1>
-
-    <h2><uib-rating ng-model="bid.valoracion"
-      max="5" read-only="true" aria-labelledby="default-rating">
-    </uib-rating></h2>
-
+<div class="modal-body" ng-include="'includes/user-info.html'">
 </div>
 
 <div class="modal-footer">
-    <button class="btn btn-success" type="button" ng-click="asignar()">Asignar</button>
+
+    <button class="btn btn-success" type="button" ng-click="asignar(delivery, bid)">
+        Asignar puja  por {{bid.precio | currency}}
+    </button>
     <button class="btn btn-warning" type="button" ng-click="cancel()">Cancelar</button>
+
 </div>
diff --git a/web/includes/completed-delivery.html b/web/includes/completed-delivery.html
@@ -20,20 +20,7 @@
 
   </uib-accordion-heading>
 
-  <h4>Esto es un Desplegable</h4>
+    <div class="panel panel-default" ng-include="'includes/delivery-data.html'"></div>
+    <div class="panel panel-default" ng-include="'includes/delivery-milestones.html'"></div>
 
-  <div>
-      <h4>Origen:</h4>
-      <h5>{{delivery.origen}}</h5>
-  </div>
-
-  <div>
-      <h4>Destino:</h4>
-      <h5>{{delivery.destino}}</h5>
-  </div>
-
-  <div>
-      <h4>Transportista:</h4>
-      <h5>{{delivery.transportista}}</h5>
-  </div>
 </div>
diff --git a/web/includes/confirm-assign.html b/web/includes/confirm-assign.html
@@ -0,0 +1,10 @@
+<div class="modal-body">
+
+    <h1>¿Desea confirmar la asignacion a "{{bid.transportista}}""
+    por la cantidad de: {{bid.precio |currency}}?</h1>
+</div>
+
+<div class="modal-footer">
+    <button class="pull-left btn btn-success" type="button" ng-click="confirm()">Confirmar</button>
+    <button class="pull-right btn btn-warning" type="button" ng-click="cancel()">Cancelar</button>
+</div>
diff --git a/web/includes/confirm-bid.html b/web/includes/confirm-bid.html
@@ -0,0 +1,10 @@
+<div class="modal-body">
+
+    <h1>¿Desea confirmar la puja {{delivery.origen}} - {{delivery.destino}}
+    por la cantidad de: {{delivery.puja | currency}}?</h1>
+</div>
+
+<div class="modal-footer">
+    <button class="pull-left btn btn-success" type="button" ng-click="confirm()">Confirmar</button>
+    <button class="pull-right btn btn-warning" type="button" ng-click="cancel()">Cancelar</button>
+</div>
diff --git a/web/includes/create-delivery.html b/web/includes/create-delivery.html
@@ -0,0 +1,110 @@
+<div ng-mouseenter="vermapa = true">
+
+    <div class="modal-body">
+
+        <div class="row form-group">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <span class="input-group-addon" id="basic-addon2">Origen</span>
+                    <input type="text" class="form-control" ng-model="origen" placeholder="Origen">
+                </div>
+            </div>
+
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <span class="input-group-addon" id="basic-addon2">Destino</span>
+                    <input type="text" class="form-control" ng-model="destino" placeholder="Destino">
+                </div>
+            </div>
+        </div>
+
+        <div class="panel">
+            <ng-map ng-if="vermapa" scrollwheel="false" class="map-view"  center="{{origen}}" zoom="10">
+              <directions
+                draggable="false"
+                travel-mode="DRIVING"
+                origin="{{origen}}"
+                destination="{{destino}}">
+              </directions>
+            </ng-map>
+        </div>
+
+        <div class="row form-group">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <span class="input-group-addon" id="basic-addon2">Recogida</span>
+
+                    <input type="text" class="form-control" uib-datepicker-popup="{{format}}" ng-model="dt" is-open="popup1.opened" datepicker-options="dateOptions" ng-required="true" close-text="Close" alt-input-formats="altInputFormats" />
+                    <span class="input-group-btn">
+                        <button type="button" class="btn btn-default" ng-click="open1()"><i class="glyphicon glyphicon-calendar"></i></button>
+                    </span>
+                </div>
+            </div>
+
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <span class="input-group-addon" id="basic-addon2">Llegada</span>
+                    <input type="text" class="form-control" uib-datepicker-popup="{{format}}" ng-model="dt" is-open="popup1.opened" datepicker-options="dateOptions" ng-required="true" close-text="Close" alt-input-formats="altInputFormats" />
+                    <span class="input-group-btn">
+                        <button type="button" class="btn btn-default" ng-click="open1()"><i class="glyphicon glyphicon-calendar"></i></button>
+                    </span>
+                </div>
+            </div>
+        </div>
+
+        <h5>Dimensiones </h5>
+        <div class="row">
+            <div class="col-xs-6">
+                <number-input ng-model="signinMaxHeight" min="0" step="0.01" start="0" hint="Altura" decimalPlaces="2"></number-input>
+            </div>
+            <div class="col-xs-6">
+                <number-input ng-model="signinMaxWidth" min="0" step="0.01" start="0" hint="Anchura" decimalPlaces="2"></number-input>
+            </div>
+            <div class="col-xs-6">
+                <number-input ng-model="signinMaxDepth" min="0" step="0.01" start="0"hint="Profundidad" decimalPlaces="2"></number-input>
+            </div>
+            <div class="col-xs-6">
+                <select class="form-control" title="Tipo">
+                    <option value="">Unidades</option>
+                    <option value="m">m</option>
+                    <option value="pulg">pulgadas</option>
+                </select>
+            </div>
+        </div>
+
+        <h5>Peso</h5>
+        <div class="row">
+            <div class="col-xs-6">
+                <number-input ng-model="signinMaxWeight" min="0" step="0.01" start="0" hint="Peso" decimalPlaces="2"></number-input>
+            </div>                    <div class="col-xs-6">
+                <select  class="form-control" title="Tipo">
+                    <option value="">Unidades</option>
+                    <option value="kg">kg</option>
+                    <option value="t">toneladas</option>
+                </select>
+            </div>
+        </div>
+
+        <h5>Tipos de mercancía</h5>
+        <div class="row">
+            <div class="col-xs-6">
+                <input class="pull-right" name="tipoEnvio" type="radio" >Paquetes<br>
+            </div>
+            <div class="col-xs-6">
+                <input class="pull-right" name="tipoEnvio" type="radio" >Liquidos<br>
+            </div>
+            <div class="col-xs-6">
+                <input class="pull-right" name="tipoEnvio" type="radio" >Animales<br>
+            </div>
+            <div class="col-xs-6">
+                <input class="pull-right" name="tipoEnvio" type="radio" >Vehículos<br>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal-footer">
+        <button class="btn btn-success" type="button" ng-click="createDelivery()">Crear Envío</button>
+        <button class="btn btn-warning" type="button" ng-click="cancel()">Cancelar</button>
+    </div>
+
+</div>
diff --git a/web/includes/delivery-data.html b/web/includes/delivery-data.html
@@ -0,0 +1,50 @@
+<div class="panel-body">
+    <div class="row">
+        <div  class="col-md-10">
+        <div class="row">
+            <div class="col-md-2">
+              <h4>Origen:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>{{delivery.origen}}</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>Destino:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>{{delivery.destino}}</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>Mercancia:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4 >{{delivery.pedido.descripcion}}</h4>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-2">
+              <h4>Tipo:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>{{delivery.pedido.tipo}}</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>Peso:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>{{delivery.pedido.peso}} Kg</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>Medidas:</h4>
+            </div>
+            <div class="col-md-2">
+              <h4>{{delivery.pedido.anchura}} X {{delivery.pedido.altura}}</h4>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-2">
+      <img src={{delivery.pedido.imagen}} class="img-rounded" alt="Tomates">
+    </div>
+</div>
+</div>