Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Responsiveness #100

Closed
wants to merge 2 commits into from
Closed

Responsiveness #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d3e1f6
solve conflicts
maurycortes Mar 2, 2019
06b86d6
Changes in responsiveness
maurycortes Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -188,7 +188,7 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rake (12.3.2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Estos cambios los hiciste tu o se hicieron solos? o te lo pidio tu enviorment? o hiciste update? debemos de checarlos en grupo primero para saber que implican las versiones que estamos usando o a las que nos vamos a mover.

rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand Down Expand Up @@ -286,4 +286,4 @@ DEPENDENCIES
web-console (>= 3.3.0)

BUNDLED WITH
1.16.1
2.0.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maurycortes No soy experto en rails pero no puedes mover versiones asi nadamas o porque decidiste cambiarlas a esas versiones? Cambiar versiones asi repentinamente puede traer errores a la aplicacion si no se checan antes, se que apenas estas aprendiendo rails pero no creo que cambiar la version sea necesario aqui, ya que no fueron cambios mayores solo fueron de responsive, esto tampoco deberia de ir. 👍

12 changes: 7 additions & 5 deletions app/views/documents/index.html.erb
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

<div class ="row">
<div class="col s12">
<h4>Bienvenido al programa...</h4>
<h4>Bienvenido al programa</h4>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Este cambio ya esta en master hasta donde yo se, yo lo movi porque esta en este commit? creo que esto esta causando conflictos con el merge. Si hiciste pull master origin y despues hiciste tu branch de ese master men?

</div>
</div>
</div>
Expand All @@ -15,9 +15,11 @@
<div class="card" style="width: 91%; margin: auto; text-align='center'">
<div class="card-content blue-grey-text center-align">
<span class="card-title">Video 1: 6 tips de Salud 360</span>
<video style="width: 640px; height: 385px;" controls>
<div style="padding: 20px; resize: both; overflow: auto;">
<video style="height: 80%; width: 80%; object-fit: contain;" controls>
<source src="https://res.cloudinary.com/he98sycd1/video/upload/v1550518726/Salud_360.mp4" type="video/mp4">
</video>
</div>
<p>El nutriólogo Adrián nos comparte en este video los 6 tips de Salud360 que nos ayudarán a lograr nuestra meta</p>
</div>
</div>
Expand All @@ -31,11 +33,11 @@
<div class="card" style="width: 91%; margin: auto; text-align='center'">
<div class="card-content blue-grey-text center-align">
<span class="card-title"><%= document.title %></span>
<div><%= cl_image_tag(document.asset.file.public_id + ".png",
:width => 600, :height => 800, :crop => :fit) %> </div>
<div style="padding: 20px; resize: both; overflow: auto;">
<%= cl_image_tag(document.asset.file.public_id + ".png", :style => "height: 80%; width: 80%; object-fit: contain;") %>
</div>
<p><%= document.description %></p>
</div>

<div class="card-action center-align blue lighten-4">
<%= link_to document.asset.url do %>
<%= content_tag :span, "Ver documento completo", :class => "blue-grey-text home-link" %>
Expand Down
123 changes: 65 additions & 58 deletions app/views/nutriologo_pages/metas_paciente.html.erb
View file
Open in desktop
@@ -1,63 +1,71 @@
<div class="card" style="width: 90%; margin: auto; text-align="center">
<h1>Metas y Objetivo del paciente <%=getPacienteName(@paciente)%></h1>
<h4>Metas y Objetivo del paciente <%=getPacienteName(@paciente)%></h4>
<br>
<br>

<h2>Cambia el objetivo del paciente</h2>
<%= form_for (@ppaciente) , :url => '/cambiar_objetivo/'+@paciente.to_s() do |f| %>

<%= f.text_field :objetivo%>

<%= f.submit "Cambiar", class: "btn btn-primary" %>
<div class = "row">
<div class = "col">
<h5>Cambia el objetivo del paciente</h5>
<%= form_for (@ppaciente) , :url => '/cambiar_objetivo/'+@paciente.to_s() do |f| %>
<%= f.text_field :objetivo%>
<%= f.submit "Cambiar", class: "btn btn-primary" %>
<% end %>
</div>
</div>

<% end %>
<h2>Agrega otra meta</h2>
<% @nueva_meta = Meta.new %>
<%= form_for (@nueva_meta) , :url => meta_path do |f| %>
<div class = "row">
<div class = "col">
<h5>Agrega otra meta</h5>
<% @nueva_meta = Meta.new %>
<%= form_for (@nueva_meta) , :url => meta_path do |f| %>
<%= f.text_field :meta%>
<%= f.hidden_field :paciente_id, :value=> @paciente %>
<%= f.submit "Guardar", class: "btn btn-primary" %>
<% end %>
</div>
</div>

<%= f.text_field :meta%>
<%= f.hidden_field :paciente_id, :value=> @paciente %>
<br>
<br>

<%= f.submit "Guardar", class: "btn btn-primary" %>
<div class = "row">
<div class = "col s12 m12 l12">
<h5>Avance: <%=@porcentaje%>%</h5>
<div id="progressbar" class="red lighten-2">
<div class="determinate green accent-4" style="width: <%= @porcentaje%>%"></div>
</div>
</div>
</div>

<% end %>
<br>
<br>
<br>
<h3>Avance: <%=@porcentaje%>%</h3>
<div class = "row">
<div class = "col s10 offset-s0 ">
<div id="progressbar" class="red lighten-2">
<div class="determinate green accent-4" style="width: <%= @porcentaje%>%"></div>
<div class = "row">
<div class = "col s12 m12 l12">
<div class="flow-text">
<table style="font-size: 12pt;">
<thead>
<tr>
<th>Descripción</th>
<th>Lograda</th>
<th colspan="11"></th>
</tr>
</thead>
<tbody>
<% @metas.each do |meta| %>
<tr>
<td><%= meta.meta %></td>
<%if meta.cumplida%>
<td class= "green darken-1 btn-block center"> Completada</td>
<%else%>
<td class= "red darken-1 btn-block center"> En proceso</td>
<%end%>

</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div class="flow-text">
<table>

<thead>
<tr>
<th>Descripcion</th>
<th>Lograda</th>
<th colspan="11"></th>
</tr>
</thead>

<tbody>
<% @metas.each do |meta| %>
<tr>
<td><%= meta.meta %></td>
<%if meta.cumplida%>
<td class= "green darken-1 btn-block center"> Completada</td>
<%else%>
<td class= "red darken-1 btn-block center"> En proceso</td>
<%end%>

</tr>
<% end %>
</tbody>
</table>
<div>
<!--
<h2>Agrega otra comentario o algun tip<h2>
<% @nuevo_comment = TipsYcomentario.new %>
Expand Down Expand Up @@ -92,16 +100,15 @@
</table>
-->


<br>
<br>
<br>

<div class="row">
<div class="col s4 offset-s1">
<%= link_to 'Ver Info Paciente', "/sesiones_paciente/"+@paciente.to_s() , class: "btn-large pink darken-1 btn-block"%>
</div>
<div class="col s8 m6 l4">
<%= link_to 'Ver Info Paciente', "/sesiones_paciente/"+@paciente.to_s() , class: "btn-large pink darken-1 btn-block"%>
</div>
</div>



<br>
</div>
<br>
</div>
21 changes: 13 additions & 8 deletions app/views/nutriologo_pages/sesiones_paciente.html.erb
View file
Open in desktop
@@ -1,5 +1,5 @@
<div class="card" style="width: 90%; margin: auto; text-align="center">
<h1>Sesiones paciente <%=getPacienteName(@paciente) %></h1>
<h4>Sesiones paciente <%=getPacienteName(@paciente) %></h4>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creo que este cambio tambien ya esta en master


<% numS=1%>
<table class="responsive-table centered highlight">
Expand Down Expand Up @@ -84,32 +84,37 @@
<tr>
<td>Datos</td>
<% @sesions.each do |sesion| %>
<td><%=link_to 'Editar datos', edit_sesion_path(sesion), class: "btn-small pink lighten-2 btn-block" %></td>
<td style="padding-top: 9.3px; padding-bottom: 9.3px;">
<%=link_to 'Editar datos', edit_sesion_path(sesion), class: "btn-small pink lighten-2" %>
</td>
<% end %>


</tr>
<tr>
<td>Citas</td>
<% @sesions.each do |sesion| %>
<td><%=link_to 'Ver Metas Cita', "/metas_cita/"+sesion.id.to_s(), class: "btn-small pink lighten-2 btn-block"%></td>
<td style="padding-top: 9.3px; padding-bottom: 9.3px;">
<%=link_to 'Ver Metas Cita', "/metas_cita/"+sesion.id.to_s(), class: "btn-small pink lighten-2" %>
</td>
<% end %>


</tr>

<td>Dietas</td>
<td><%= link_to 'Dietas', "/dietas_paciente/"+@paciente.to_s(), class: "btn pink darken-1 btn-block" %></td>
<td style="padding-top: 9.3px; padding-bottom: 9.3px;">
<%= link_to 'Dietas', "/dietas_paciente/"+@paciente.to_s(), class: "btn-small pink darken-1" %>
</td>

</tbody>
</table>
<br>
<br>
<br>
<div class="row">
<div class="col s4 offset-s0">
<%= link_to 'Ver Metas y Objetivo Paciente', "/metas_paciente/"+@paciente.to_s(), class: "btn pink darken-1 btn-block" %>
</div>
<div class="col s4 m4 l4 offset-s0">
<%= link_to 'Ver Metas y Objetivo Paciente', "/metas_paciente/"+@paciente.to_s(), class: "btn pink darken-1 btn-block" %>
</div>
</div>
<br>
</div>
92 changes: 49 additions & 43 deletions app/views/nutriologos/sessions/new.html.erb
View file
Open in desktop
@@ -1,47 +1,53 @@
<br></br>
<div class="card" style="width: 50%; margin: auto; text-align="center">
<div class="row">
<br></br>
<div class="col s6 offset-s3"><span>Bienvenido al sistema Salud 360</span></div>
<br></br>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="col s6 offset-s3">
<div class="field">
<%= f.label :Usuario %><br />
<%= f.text_field :username, autofocus: true, autocomplete: "username" %>
</div>
</div>
<div class="col s6 offset-s3">
<div class="field">
<%= f.label :Contraseña %><br />
<%= f.password_field :password, autocomplete: "current-password" %>
</div>
</div>
<div class="col s6 offset-s3">
<% if devise_mapping.rememberable? -%>
<label>
<%= f.check_box :remember_me %>
<span>Remember Me </span>
</label>
</div>
<% end -%>
<br></br>
<div class="col s6 offset-s3">
<br></br>
<div class="actions">
<%= f.submit "Iniciar Sesión", class: "waves-effect waves-light btn pink darken-1", style: "width: 100%" %>
</div>
</div>
<% if false %>
<div class="col s6 offset-s3">
<br></br>
<%= render "nutriologos/shared/links" %>
</div>
<% end %>
<div class="card" style="width: 60%; margin: auto; text-align="center">
<div class="row">
<br></br>
<div class="col s6 offset-s3">
<span>Bienvenido al sistema Salud 360</span>
</div>
<br></br>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="col s10 m8 l6 offset-l3 offset-m2 offset-s1">
<div class="field">
<%= f.label :Usuario %>
<br/>
<%= f.text_field :username, autofocus: true, autocomplete: "username" %>
</div>
</div>
<div class="col s10 m8 l6 offset-l3 offset-m2 offset-s1">
<div class="field">
<%= f.label :Contraseña %>
<br/>
<%= f.password_field :password, autocomplete: "current-password" %>
</div>
</div>
<div class="col s10 m8 l6 offset-l3 offset-m2 offset-s1">
<% if devise_mapping.rememberable? -%>
<label>
<%= f.check_box :remember_me %>
<span>Remember Me </span>
</label>
</div>
<% end -%>

<div class="col s6 offset-s3">
<br></br>
</div>
<br></br>

<div class="col s10 m8 l6 offset-l3 offset-m2 offset-s1">
<br></br>
<div class="actions">
<%= f.submit "Iniciar Sesión", class: "waves-effect waves-light btn pink darken-1", style: "width: 100%" %>
</div>
</div>
<% if false %>
<div class="col s10 m8 l6 offset-l3 offset-m2 offset-s1">
<br></br>
<%= render "nutriologos/shared/links" %>
</div>
<% end %>

<div class="col s6 offset-s3">
<br></br>
</div>
</div>
<% end %>
<% end %>
</div>