From 320bfb628396b6ae3a77d8ea9c1972fb091868a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Mar 2019 19:01:26 -0600 Subject: [PATCH] Cambios en las tablas, traducciones y estilos generales --- Gemfile.lock | 269 +++++++++++++++++++++++++ TODO | 28 ++- app/controllers/courses_controller.rb | 1 + app/controllers/links_controller.rb | 1 + app/views/announcements/_form.html.erb | 2 +- app/views/announcements/edit.html.erb | 2 +- app/views/announcements/index.html.erb | 101 +++------- app/views/announcements/new.html.erb | 4 +- app/views/announcements/show.html.erb | 2 +- app/views/courses/edit.html.erb | 2 +- app/views/courses/index.html.erb | 122 ++++------- app/views/courses/new.html.erb | 2 +- app/views/courses/show.html.erb | 2 +- app/views/documents/edit.html.erb | 2 +- app/views/documents/index.html.erb | 101 +++------- app/views/documents/new.html.erb | 2 +- app/views/documents/show.html.erb | 2 +- app/views/links/edit.html.erb | 2 +- app/views/links/index.html.erb | 119 ++++------- app/views/links/new.html.erb | 2 +- app/views/links/show.html.erb | 1 + app/views/professors/edit.html.erb | 2 +- app/views/professors/index.html.erb | 111 +++------- app/views/professors/new.html.erb | 2 +- app/views/professors/show.html.erb | 2 +- app/views/users/edit.html.erb | 2 +- app/views/users/index.html.erb | 101 +++------- app/views/users/new.html.erb | 2 +- app/views/users/show.html.erb | 6 +- 29 files changed, 500 insertions(+), 497 deletions(-) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..6944330 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,269 @@ +GIT + remote: https://github.com/codahale/bcrypt-ruby.git + revision: 7644e3684d96fb49f5aa20cb5f547cb1b56b3f38 + specs: + bcrypt (3.1.12) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.2) + actionpack (= 5.2.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.2) + activesupport (= 5.2.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) + marcel (~> 0.3.1) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.4.10.2) + execjs + bindex (0.5.0) + bootsnap (1.4.1) + msgpack (~> 1.0) + bootstrap-datepicker-rails (1.8.0.1) + railties (>= 3.0) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + builder (3.2.3) + byebug (11.0.0) + capybara (3.14.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + devise (4.6.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + ffi (1.10.0-x64-mingw32) + figaro (1.1.1) + thor (~> 0.14) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + msgpack (1.2.8) + msgpack (1.2.8-x64-mingw32) + multi_json (1.13.1) + nio4r (2.3.1) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + nokogiri (1.10.1-x64-mingw32) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.0) + pg (1.1.4) + pg (1.1.4-x64-mingw32) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) + bundler (>= 1.3.0) + railties (= 5.2.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.3.0) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + selenium-webdriver (3.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + tzinfo-data (1.2018.9) + tzinfo (>= 1.0.0) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + warden (1.2.8) + rack (>= 2.0.6) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + x64-mingw32 + +DEPENDENCIES + bcrypt! + bootsnap (>= 1.1.0) + bootstrap-datepicker-rails + bootstrap-sass (~> 3.3.7) + byebug + capybara (>= 2.15) + chromedriver-helper + coffee-rails (~> 4.2) + devise + figaro + jbuilder (~> 2.5) + jquery-rails (~> 4.3.3) + listen (>= 3.0.5, < 3.2) + pg (>= 0.18, < 2.0) + puma (~> 3.11) + rails (~> 5.2.2) + sass-rails (~> 5.0) + sassc + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.6.1p33 + +BUNDLED WITH + 1.17.3 diff --git a/TODO b/TODO index c9467f2..bba0111 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,24 @@ -BACK - ESTEBAN ROIZ +FRONT - ALDO Y HECTOR +- MEJORAR LAS TABLAS Y QUITAR LAS COSAS QUE NO SIRVEN +- PONER ICONOS EN LAS TABLAS +- RESPONSIVO LA TABLA +- CAMBIAR A H2 +- TRADUCCIR TODO (Botones de la tabla, tablas, flase y true) +- Que no salgan los botones de "NEW PROFESOR" ... + +BACK - ESTEBAN Y ALEX +Cuando eres un profesor +- Que no se vean todos los links unicamente los que el pueda usar +- Que no pueda hacer una materia (/new debe estar prohibido) +- Que no pueda hacer una vinculacion (/new debe estar prohibido) +- Cuando guardas el usuario en modo editar y no le pones contraseña te manda error, (deberias de poder salir sin cambios) +- Validar cada documento este linkeado a un profesor +- Validar que cada anuncio este linkeado a un profesor +- Remover el campo de fecha en el form ya que este debe ser autogenerado el dia y la hora en que se creo el anuncio +- Vinculaciones esta tronando porque el type debe ser link_type + -actualizar roles -profesores recien creados inactivos -autentificar rutas -gema auth -FRONT - ALDO HECTOR -front "bonito" CRUDS -navbar - cambiar links \ No newline at end of file diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 6ab0aef..ec94d79 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -4,6 +4,7 @@ class CoursesController < ApplicationController # GET /courses.json def index @courses = Course.all + @curr_user = current_user end # GET /courses/1 diff --git a/app/controllers/links_controller.rb b/app/controllers/links_controller.rb index f736cc9..75f92fc 100644 --- a/app/controllers/links_controller.rb +++ b/app/controllers/links_controller.rb @@ -5,6 +5,7 @@ class LinksController < ApplicationController # GET /links.json def index @links = Link.all + @curr_user = current_user end # GET /links/1 diff --git a/app/views/announcements/_form.html.erb b/app/views/announcements/_form.html.erb index 432ebf9..8dbdb9e 100644 --- a/app/views/announcements/_form.html.erb +++ b/app/views/announcements/_form.html.erb @@ -22,7 +22,7 @@ <%= form.datetime_select :date %> - <
+
<%= form.submit 'Guardar', :class => 'btn btn-lg btn-primary btn-block' %>
<% end %> diff --git a/app/views/announcements/edit.html.erb b/app/views/announcements/edit.html.erb index cc3eca9..749fae1 100644 --- a/app/views/announcements/edit.html.erb +++ b/app/views/announcements/edit.html.erb @@ -1,5 +1,5 @@
-

Editar Anuncio

+

Editar Anuncio

<%= render 'form', announcement: @announcement %> diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb index 16317c9..a30b45d 100644 --- a/app/views/announcements/index.html.erb +++ b/app/views/announcements/index.html.erb @@ -1,74 +1,27 @@ -

<%= notice %>

- -

- - - - - - - Cursos - - - - -
- -
-
-
-
-
-
-

Anuncios

-
-
-
-
- <% if !@curr_user.admin %> - <%= link_to 'New Announcement', new_announcement_path %> - <% end %> -
- - - - - - - - - - - - - <% @announcements.each do |announcement| %> - - - - - - - - <% end %> - -
DescriptionDate
<%= announcement.description %><%= announcement.date %><%= link_to 'Show', announcement %><%= link_to 'Edit', edit_announcement_path(announcement) %><%= link_to 'Destroy', announcement, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +
+

<%= notice %>

+

Anuncios

+ <% if !@curr_user.admin %> + <%= link_to 'Nuevo Anuncio', new_announcement_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + <% @announcements.each do |announcement| %> + + + + + + + + <% end %> + +
DescripciónFecha
<%= announcement.description %><%= announcement.date %><%= link_to 'Mostrar', announcement %><%= link_to 'Editar', edit_announcement_path(announcement) %><%= link_to 'Borrar', announcement, method: :delete, data: { confirm: 'Esta Seguro?' } %>
+
diff --git a/app/views/announcements/new.html.erb b/app/views/announcements/new.html.erb index 813ff1e..26dcc9f 100644 --- a/app/views/announcements/new.html.erb +++ b/app/views/announcements/new.html.erb @@ -1,10 +1,10 @@
-

Nuevo Anuncio

+

Nuevo Anuncio

<%= render 'form', announcement: @announcement %>

- <%= link_to 'Back', announcements_path , class:"btn btn-sm btn-primary"%> + <%= link_to 'Regresar', announcements_path , class:"btn btn-sm btn-primary"%>

diff --git a/app/views/announcements/show.html.erb b/app/views/announcements/show.html.erb index cadc969..4b05f34 100644 --- a/app/views/announcements/show.html.erb +++ b/app/views/announcements/show.html.erb @@ -1,5 +1,5 @@
-

Mostrar Anuncio

+

Mostrar Anuncio

<%= notice %>

diff --git a/app/views/courses/edit.html.erb b/app/views/courses/edit.html.erb index 935ebca..12c6642 100644 --- a/app/views/courses/edit.html.erb +++ b/app/views/courses/edit.html.erb @@ -1,5 +1,5 @@

-

Editar Curso

+

Editar Curso

<%= render 'form', course: @course %> diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 9494c6c..bb5537c 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -1,84 +1,40 @@ +
+

Materias

<%= notice %>

- -

- - - - - - - Cursos - - - - -
- -
-
-
-
-
-
-

Materias

-
-
-
-
- <%= link_to 'New Course', new_course_path %> -
- - - - - - - - - - - - - - - - - - - <% @courses.each do |course| %> - - - - - - - - - - - - - - <% end %> - -
NameCodeClu courseClu laboratoryClu unitiesStatusTypeInformation
<%= course.name %><%= course.code %><%= course.clu_course %><%= course.clu_laboratory %><%= course.clu_unities %><%= course.status %><%= course.course_type %><%= course.information %><%= link_to 'Show', course %><%= link_to 'Edit', edit_course_path(course) %><%= link_to 'Destroy', course, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +<% if @curr_user.admin%> + <%= link_to 'Nueva Materia', new_course_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + + + + + + + <% @courses.each do |course| %> + + + + + + + + + + + + + + <% end %> + +
NombreClaveCLU MateriasCLU LaboratorioCLU UnidadesActivo Este SemestreTipoInformaciónAcciones
<%= course.name %><%= course.code %><%= course.clu_course %><%= course.clu_laboratory %><%= course.clu_unities %><%= course.status %><%= course.course_type %><%= course.information %><%= link_to 'Mostrar', course %><%= link_to 'Editar', edit_course_path(course) %><%= link_to 'Borrar', course, method: :delete, data: { confirm: 'Esta seguro?' } %>
+
+ diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index 3912189..e3b2c97 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -1,5 +1,5 @@
-

Nuevo Curso

+

Nuevo Curso

<%= render 'form', course: @course %>

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 619c798..8adbc5e 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,5 +1,5 @@

-

Curso

+

Curso

<%= notice %>

diff --git a/app/views/documents/edit.html.erb b/app/views/documents/edit.html.erb index ba757df..153d956 100644 --- a/app/views/documents/edit.html.erb +++ b/app/views/documents/edit.html.erb @@ -1,5 +1,5 @@

-

Editar Documento

+

Editar Documento

<%= render 'form', document: @document %> diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index 2e143da..950547c 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -1,74 +1,27 @@ -

<%= notice %>

- -

- - - - - - - Cursos - - - - -
- -
-
-
-
-
-
-

Documentos

-
-
-
-
- <% if !@curr_user.admin %> - <%= link_to 'New Document', new_document_path %> - <% end %> -
- - - - - - - - - - - - - <% @documents.each do |document| %> - - - - - - - - <% end %> - -
DescriptionUrl
<%= document.description %><%= document.url %><%= link_to 'Show', document %><%= link_to 'Edit', edit_document_path(document) %><%= link_to 'Destroy', document, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +
+

<%= notice %>

+

Documentos

+ <% if !@curr_user.admin %> + <%= link_to 'Nuevo Documento', new_document_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + <% @documents.each do |document| %> + + + + + + + + <% end %> + +
DescripciónURLAcciones
<%= document.description %><%= document.url %><%= link_to 'Mostrar', document %><%= link_to 'Editar', edit_document_path(document) %><%= link_to 'Borrar', document, method: :delete, data: { confirm: 'Esta Seguro?' } %>
+
diff --git a/app/views/documents/new.html.erb b/app/views/documents/new.html.erb index d395ffb..afda0da 100644 --- a/app/views/documents/new.html.erb +++ b/app/views/documents/new.html.erb @@ -1,5 +1,5 @@
-

Nuevo Documento

+

Nuevo Documento

<%= render 'form', document: @document %> diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index 7f24182..2aecbcf 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -1,5 +1,5 @@
-

Mostrar Documento

+

Mostrar Documento

<%= notice %>

diff --git a/app/views/links/edit.html.erb b/app/views/links/edit.html.erb index 15eac7b..380e2ab 100644 --- a/app/views/links/edit.html.erb +++ b/app/views/links/edit.html.erb @@ -1,5 +1,5 @@

-

Editar Proyecto

+

Editar Vinculación

<%= render 'form', link: @link %> diff --git a/app/views/links/index.html.erb b/app/views/links/index.html.erb index fde2356..50c2e10 100644 --- a/app/views/links/index.html.erb +++ b/app/views/links/index.html.erb @@ -1,82 +1,37 @@ -

<%= notice %>

- -

- - - - - - - Vinculaciones - - - - -
- -
-
-
-
-
-
-

Vinculaciones

-
-
-
-
- <%= link_to 'New Link', new_link_path %> -
- - - - - - - - - - - - - - - - - - <% @links.each do |link| %> - - - - - - - - - - - - - <% end %> - -
NameDescriptionParticipantsStart dateEnd dateTypeUrl
<%= link.name %><%= link.description %><%= link.participants %><%= link.start_date %><%= link.end_date %><%= link.type %><%= link.url %><%= link_to 'Show', link %><%= link_to 'Edit', edit_link_path(link) %><%= link_to 'Destroy', link, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +
+

<%= notice %>

+

Vinculaciones

+ <% if @curr_user.admin%> + <%= link_to 'Nueva Vinculación', new_link_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + + + + + + <% @links.each do |link| %> + + + + + + + + + + + + + <% end %> + +
NombreDescripciónParticipantesFecha de InicioFecha de CierreTipoURLAcciones
<%= link.name %><%= link.description %><%= link.participants %><%= link.start_date %><%= link.end_date %><%= link.link_type %><%= link.url %><%= link_to 'Mostrar', link %><%= link_to 'Editar', edit_link_path(link) %><%= link_to 'Borrar', link, method: :delete, data: { confirm: 'Esta Seguro?' } %>
+
diff --git a/app/views/links/new.html.erb b/app/views/links/new.html.erb index 4a6b2df..81fffc2 100644 --- a/app/views/links/new.html.erb +++ b/app/views/links/new.html.erb @@ -1,5 +1,5 @@
-

Nuevo Proyecto

+

Nuevo Vinculación

<%= render 'form', link: @link %> diff --git a/app/views/links/show.html.erb b/app/views/links/show.html.erb index 6f43e7e..cfe9e33 100644 --- a/app/views/links/show.html.erb +++ b/app/views/links/show.html.erb @@ -1,4 +1,5 @@
+

Mostrar Vinculación

<%= notice %>

diff --git a/app/views/professors/edit.html.erb b/app/views/professors/edit.html.erb index 1ab5622..d6a91b3 100644 --- a/app/views/professors/edit.html.erb +++ b/app/views/professors/edit.html.erb @@ -1,5 +1,5 @@

-

Editar Profesor

+

Editar Profesor

<%= render 'form', professor: @professor %> diff --git a/app/views/professors/index.html.erb b/app/views/professors/index.html.erb index 5b3d0fa..3bb7b9b 100644 --- a/app/views/professors/index.html.erb +++ b/app/views/professors/index.html.erb @@ -1,80 +1,31 @@ -

<%= notice %>

- -

- - - - - - - Profesores - - - - -
- -
-
-
-
-
-
-

Profesores

-
-
-
-
- <%= link_to 'New Professor', new_professor_path, class: "btn btn-primary" %> -
- - - - - - - - - - - - - - - - - <% @professors.each do |professor| %> - - - - - - - - - - - - <% end %> - -
NombreApellido paternoApellido maternoEmailOficinaResumenAcción
<%= professor.name %><%= professor.father_last_name %><%= professor.mother_last_name %><%= professor.email %><%= professor.office %><%= professor.resume %><%= link_to 'Show', professor %><%= link_to 'Edit', edit_professor_path(professor) %><%= link_to 'Destroy', professor, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +
+

<%= notice %>

+

Profesores

+ <% if @curr_user.admin%> + <%= link_to 'Nuevo Profesor', new_professor_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + + + <% @professors.each do |professor| %> + + + + + + + + + + <% end %> + +
NombreEmailOficinaResumenAcciones
<%= professor.name %> <%= professor.father_last_name %> <%= professor.mother_last_name %><%= professor.email %><%= professor.office %><%= professor.resume %><%= link_to 'Mostrar', professor %><%= link_to 'Editar', edit_professor_path(professor) %><%= link_to 'Borrar', professor, method: :delete, data: { confirm: 'Esta Seguro?' } %>
+
diff --git a/app/views/professors/new.html.erb b/app/views/professors/new.html.erb index d12f6b7..cfbb6e9 100644 --- a/app/views/professors/new.html.erb +++ b/app/views/professors/new.html.erb @@ -1,5 +1,5 @@
-

Nuevo Profesor

+

Nuevo Profesor

<%= render 'form', professor: @professor %>

<%= link_to 'Back', professors_path , class:"btn btn-sm btn-primary"%> diff --git a/app/views/professors/show.html.erb b/app/views/professors/show.html.erb index b2a6905..0e7e68f 100644 --- a/app/views/professors/show.html.erb +++ b/app/views/professors/show.html.erb @@ -1,5 +1,5 @@

-

Profesor

+

Mostrar Profesor

<%= notice %>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index f1b4a2b..98c359a 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,5 +1,5 @@

-

Editar Usuario

+

Editar Usuario

<%= render 'form', user: @user %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index d7ea453..ce24f99 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,74 +1,27 @@ -

<%= notice %>

- -

- - - - - - - Cursos - - - - -
- -
-
-
-
-
-
-

Usuarios

-
-
-
-
- <% if @curr_user.admin%> - <%= link_to 'New User', new_user_path %> - <% end %> -
- - - - - - - - - - - - - <% @users.each do |user| %> - - - - - - - - <% end %> - -
RoleAdmin
<%= user.email %><%= user.admin %><%= link_to 'Show', user %><%= link_to 'Edit', edit_user_path(user) %><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
-
-
- -
-
-
- -
- - - - - - - - \ No newline at end of file +
+

Usuarios

+

<%= notice %>

+ <% if @curr_user.admin%> + <%= link_to 'Nuevo Usuario', new_user_path, class: "btn btn-primary" %> + <% end %> + + + + + + + + + + <% @users.each do |user| %> + + + + + + + + <% end %> + +
RolAdministradorAcciones
<%= user.email %><%= user.admin %><%= link_to 'Mostrar', user %><%= link_to 'Editar', edit_user_path(user) %><%= link_to 'Borrar', user, method: :delete, data: { confirm: 'Esta seguro?' } %>
+
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 21e252b..10c287d 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,5 +1,5 @@
-

Nuevo Usuario

+

Nuevo Usuario

<%= render 'form', user: @user %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9284810..758f552 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,12 +1,12 @@
-

Usuario

+

Mostrar Usuario

- Email: + Correo: <%= @user.email %>

- Admin: + Administrador: <%= @user.admin %>