Changeset 101698b in RedSur

Timestamp:

May 25, 2016, 12:36:15 PM (8 years ago)

Author:

aosorio <aosorio@…>

Branches:

modelo_minuta

Children:

0b9e14e

Parents:

220994c

Message:

Agregado el campo de Hora de Finalización para las Minutas

Location:

app

Files:

• assets/javascripts/app/views/publisher/poll_creator_view.js (modified) (3 diffs)
• assets/javascripts/app/views/publisher_view.js (modified) (1 diff)
• assets/stylesheets/publisher.scss (modified) (4 diffs)
• assets/templates/poll_creator_tpl.jst.hbs (modified) (2 diffs)
• assets/templates/poll_tpl.jst.hbs (modified) (1 diff)
• controllers/status_messages_controller.rb (modified) (1 diff)
• models/poll.rb (modified) (2 diffs)

app/assets/javascripts/app/views/publisher/poll_creator_view.js

@@ -15 +15 @@
     'click .add-horainicio': 'addHorainicio',
     'click .remove-horainicio': 'removeHorainicio',
+    'click .add-horafinal': 'addHorafinal',
+    'click .remove-horafinal': 'removeHorafinal',
     'click .add-asistente': 'addAsistente',
     'click .remove-asistente': 'removeAsistente',
@@ -100 +102 @@
   },
 
+  /* ##### Hora de Finalización ##### */
+  removeHorafinal: function(evt){
+    evt.stopPropagation();
+    if (this.horafinalCount == 1) {
+      this.$(evt.target).parent().css('display','none');
+      this.horafinalCount--;
+      return;
+    }
+    this.$(evt.target).parent().remove();
+    this.trigger('change');
+    this.horafinalCount--;
+  },
+
+  addHorafinal: function(){
+    this.horafinalCount++;
+    var el = this.$('.poll-horafinal-template:first');
+    if (el.css('display') == 'block') {
+      el = el.clone();
+    } else if (el.css('display') == 'none' || !el.css('display')) {
+      el.css('display','block');
+    } 
+    el.attr('id','poll-horafinal-'+this.horafinalCount);
+    this.$pollAnswers.append(el);
+  },
+
   /* ##### Asistente ##### */
   removeAsistente: function(evt){
@@ -205 +232 @@
     this.responsableCount = 0;
     this.fechaCount = 0;
+    this.horainicioCount = 0;
+    this.horafinalCount = 0;
     this.asistenteCount = 0;
     this.asuntoCount = 0;

app/assets/javascripts/app/views/publisher_view.js

@@ -190 +190 @@
       "poll_fechas" : serializedForm["poll_fechas[]"],
       "poll_horainicios" : serializedForm["poll_horainicios[]"],
+      "poll_horafinals" : serializedForm["poll_horafinals[]"],
       "poll_asistentes" : serializedForm["poll_asistentes[]"],
       "poll_asuntos" : serializedForm["poll_asuntos[]"],

app/assets/stylesheets/publisher.scss

@@ -131 +131 @@
         }
 
+        .remove-horafinal.entypo.cross {
+          display: none;
+          color: lighten($black,75%);
+          &.active { display: block; }
+          &:hover { color: $black; }
+          line-height: 30px;
+          font-size: 18px;
+          cursor: pointer;
+        }
+
         .remove-asistente.entypo.cross {
           display: none;
@@ -241 +251 @@
         }
 
+        .horafinal {
+          height: 20px;
+          width: 91.5%;
+          border: 1px solid #DDDDDD !important;
+          border-radius: 4px;
+        }
+
         .asistente {
           height: 80px;
@@ -305 +322 @@
         }
 
+        .poll-horafinal-template {
+          /*border: 1px solid green;*/
+          width: 100%;
+          margin-left: 0px;
+        }
+
         .poll-asistente-template {
           /*border: 1px solid green;*/
@@ -407 +430 @@
         }
         #boton_agregar_inicio:hover {
+          background-color: #FAFAFA;
+          color: #3F8FBA;
+          width: 130px;
+          border: solid 1px #808080;
+          border-radius: 5px;
+          cursor: pointer;
+          text-align: center;
+          padding: 5px;
+          text-decoration: none;
+        }
+        #boton_agregar_horafinal {
+          background-color: #FAFAFA;
+          width: 130px;
+          border: solid 1px #808080;
+          border-radius: 5px;
+          cursor: pointer;
+          text-align: center;
+          padding: 5px;
+          text-decoration: none;
+        }
+        #boton_agregar_final:hover {
           background-color: #FAFAFA;
           color: #3F8FBA;

app/assets/templates/poll_creator_tpl.jst.hbs

@@ -4 +4 @@
   <span id="boton_agregar_responsable" class="add-responsable">Responsable</span>
   <span id="boton_agregar_fecha" class="add-fecha">Fecha</span>
-  <span id="boton_agregar_horainicio" class="add-horainicio">Hora de Inicio</span>
+  <span id="boton_agregar_horainicio" class="add-horainicio">Hora de inicio</span>
+  <span id="boton_agregar_horafinal" class="add-horafinal">Hora de finalización</span>
   <span id="boton_agregar_asistente" class="add-asistente">Asistentes</span>
   <span id="boton_agregar_asunto" class="add-asunto">Asunto</span>
@@ -27 +28 @@
     <i class="remove-fecha entypo cross" style='display:block'></i>
   </div>
-  <!--##### Fecha #####-->
+  <!--##### Hora de Inicio #####-->
   <div class="poll-horainicio-template span11" style='display:none'>
     <span id="titulos_campos_minuta">Hora de inicio:</span>
     <input type="textarea" class="horainicio input-block-level" name="poll_horainicios[]" placeholder="">
     <i class="remove-horainicio entypo cross" style='display:block'></i>
+  </div>
+  <!--##### Hora de Finalización #####-->
+  <div class="poll-horafinal-template span11" style='display:none'>
+    <span id="titulos_campos_minuta">Hora de finalización:</span>
+    <input type="textarea" class="horafinal input-block-level" name="poll_horafinals[]" placeholder="">
+    <i class="remove-horafinal entypo cross" style='display:block'></i>
   </div>
   <!--##### Asistentes #####-->

app/assets/templates/poll_tpl.jst.hbs

@@ -15 +15 @@
   {{#each poll.poll_horainicios}}
     <div class="contenido_minuta">
-      <span id="titulos_campos_minuta">Hora de Inicio: </span>{{poll_horainicio.text}}
+      <span id="titulos_campos_minuta">Hora de inicio: </span>{{poll_horainicio.text}}
+    </div>
+  {{/each}}
+  <!-- ##### Hora de Finalización ##### -->
+  {{#each poll.poll_horafinals}}
+    <div class="contenido_minuta">
+      <span id="titulos_campos_minuta">Hora de finalización: </span>{{poll_horafinal.text}}
     </div>
   {{/each}}

app/controllers/status_messages_controller.rb

@@ -83 +83 @@
       [*params[:poll_horainicios]].each do |poll_horainicio|
         @status_message.poll.poll_horainicios.build(text: poll_horainicio)
+      end
+    end
+
+    # Create text field Hora de finalización
+    if params[:poll_horafinals].present?
+      [*params[:poll_horafinals]].each do |poll_horafinal|
+        @status_message.poll.poll_horafinals.build(text: poll_horafinal)
       end
     end

app/models/poll.rb

@@ -9 +9 @@
   has_many :poll_fechas
   has_many :poll_horainicios
+  has_many :poll_horafinals
   has_many :poll_asistentes
   has_many :poll_asuntos
@@ -38 +39 @@
       :poll_fechas => self.poll_fechas,
       :poll_horainicios => self.poll_horainicios,
+      :poll_horafinals => self.poll_horafinals,
       :poll_asistentes => self.poll_asistentes,
       :poll_asuntos => self.poll_asuntos,