From a032f08d4b8bb44bd127e9385916d17bc4efc791 Mon Sep 17 00:00:00 2001 From: Onder Date: Sat, 11 Mar 2017 01:28:22 +0300 Subject: [PATCH] department, member cotroller methods added --- README.rdoc | 27 ++---------- app/controllers/departments_controller.rb | 31 +++++++++++++- app/controllers/members_controller.rb | 50 +++++++++++++++++++++++ app/models/department.rb | 1 + app/views/departments/_form.html.erb | 17 ++++++++ app/views/departments/edit.html.erb | 2 + app/views/departments/index.html.erb | 25 ++++++++++++ app/views/departments/new.html.erb | 17 +------- app/views/departments/show.html.erb | 4 +- app/views/layouts/_messages.html.erb | 5 +++ app/views/layouts/application.html.erb | 7 +--- app/views/members/_form.html.erb | 21 ++++++++++ app/views/members/edit.html.erb | 2 + app/views/members/index.html.erb | 30 ++++++++++++++ app/views/members/new.html.erb | 2 + app/views/members/show.html.erb | 9 ++++ 16 files changed, 201 insertions(+), 49 deletions(-) create mode 100644 app/views/departments/_form.html.erb create mode 100644 app/views/departments/edit.html.erb create mode 100644 app/views/departments/index.html.erb create mode 100644 app/views/layouts/_messages.html.erb create mode 100644 app/views/members/_form.html.erb create mode 100644 app/views/members/edit.html.erb create mode 100644 app/views/members/index.html.erb create mode 100644 app/views/members/new.html.erb create mode 100644 app/views/members/show.html.erb diff --git a/README.rdoc b/README.rdoc index dd4e97e..95c329b 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,28 +1,7 @@ == README -This README would normally document whatever steps are necessary to get the -application up and running. +Open source Online Ticketing System. -Things you may want to cover: +== License -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... - - -Please feel free to use a different markup language if you do not plan to run -rake doc:app. +GNU GENERAL PUBLIC LICENSE V3 diff --git a/app/controllers/departments_controller.rb b/app/controllers/departments_controller.rb index d302a9c..eb1d8d6 100644 --- a/app/controllers/departments_controller.rb +++ b/app/controllers/departments_controller.rb @@ -1,21 +1,48 @@ class DepartmentsController < ApplicationController + def index + @departments = Department.all + end + + def new @department = Department.new end + + def edit + @department = Department.find(params[:id]) + end + def create #render plain: params[:department].inspect @department = Department.new(department_params) if @department.save - flash[:notice] "Department was successfully created." + flash[:notice] = "Department was successfully created." redirect_to department_path(@department) else render :new end end -def show + def show + @department = Department.find(params[:id]) + end + + def destroy + @department = Department.find(params[:id]) + @department.destroy + flash[:notice] = "Department was successfully deleted." + redirect_to departments_path + end + +def update @department = Department.find(params[:id]) + if @department.update(department_params) + flash[:notice] = "Department was successfully updated." + redirect_to department_path(@department) + else + render :edit + end end diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 180b1bb..fde8046 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,3 +1,53 @@ class MembersController < ApplicationController + def index + @members = Member.all + end + + def new + @member = Member.new + end + + def edit + @member = Member.find(params[:id]) + end + + def create + #render plain: params[:member].inspect + @member = Member.new(member_params) + if @member.save + + flash[:notice] = "Member was successfully created." + redirect_to member_path(@member) + else + render :new + end + end + + def show + @member = Member.find(params[:id]) + end + + def destroy + @member = Member.find(params[:id]) + @member.destroy + flash[:notice] = "Member was successfully deleted." + redirect_to members_path + end + +def update + @member = Member.find(params[:id]) + if @member.update(member_params) + flash[:notice] = "Member was successfully updated." + redirect_to member_path(@member) + else + render :edit + end +end + + + private + def member_params + params.require(:member).permit(:email,:password) + end end diff --git a/app/models/department.rb b/app/models/department.rb index ff3ee6a..918b30c 100644 --- a/app/models/department.rb +++ b/app/models/department.rb @@ -1,2 +1,3 @@ class Department < ActiveRecord::Base + validates :title, presence: true end diff --git a/app/views/departments/_form.html.erb b/app/views/departments/_form.html.erb new file mode 100644 index 0000000..cab9ed5 --- /dev/null +++ b/app/views/departments/_form.html.erb @@ -0,0 +1,17 @@ +<% if @department.errors.any? %> + +<% end %> +<%= form_for @department do |f| %> +

+<%= f.label :title %>
+<%= f.text_field :title %> +

+

+ <%= f.submit %> +

+<% end %> +<%=link_to "Back to department list", departments_path %> diff --git a/app/views/departments/edit.html.erb b/app/views/departments/edit.html.erb new file mode 100644 index 0000000..beb7a18 --- /dev/null +++ b/app/views/departments/edit.html.erb @@ -0,0 +1,2 @@ +

Edit department

+<%= render 'form' %> diff --git a/app/views/departments/index.html.erb b/app/views/departments/index.html.erb new file mode 100644 index 0000000..1b9cbed --- /dev/null +++ b/app/views/departments/index.html.erb @@ -0,0 +1,25 @@ +

Listing all departments

+

+ <%=link_to "Create new department", new_department_path %> +

+ + + + + + <%@departments.each do |department| %> + + + + + + <% end %> +
+ Title +
+ <%=department.title%> + + <%=link_to "Edit", edit_department_path(department) %> + <%=link_to "Show", department_path(department) %> + <%=link_to "Delete", department_path(department), method: :delete, data: {confirm: "are you sure"} %> +
diff --git a/app/views/departments/new.html.erb b/app/views/departments/new.html.erb index 352c943..87dbd43 100644 --- a/app/views/departments/new.html.erb +++ b/app/views/departments/new.html.erb @@ -1,17 +1,2 @@

Create a department

-<% if @department.errors.any? %> - -<% end %> -<%= form_for @department do |f| %> -

-<%= f.label :title %>
-<%= f.text_field :title %> -

-

- <%= f.submit %> -

-<% end %> +<%= render 'form' %> diff --git a/app/views/departments/show.html.erb b/app/views/departments/show.html.erb index 8691d77..10b75ad 100644 --- a/app/views/departments/show.html.erb +++ b/app/views/departments/show.html.erb @@ -1,4 +1,6 @@

Selected Department

-Title : <%=@article.title%> +Title : <%=@department.title%>

+<%=link_to "Edit", edit_department_path(@department) %> | +<%=link_to "Back to department list", departments_path %> diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb new file mode 100644 index 0000000..4ea3d27 --- /dev/null +++ b/app/views/layouts/_messages.html.erb @@ -0,0 +1,5 @@ +<% flash.each do |name,msg| %> + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c8654fd..e4bc8d6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,12 +7,7 @@ <%= csrf_meta_tags %> -<% flash.each do |name,msg| %> - +<%= render 'layouts/messages'%> <%= yield %> diff --git a/app/views/members/_form.html.erb b/app/views/members/_form.html.erb new file mode 100644 index 0000000..80178ba --- /dev/null +++ b/app/views/members/_form.html.erb @@ -0,0 +1,21 @@ +<% if @member.errors.any? %> + +<% end %> +<%= form_for @member do |f| %> +

+<%= f.label :email %>
+<%= f.text_field :email %> +

+

+<%= f.label :password %>
+<%= f.text_field :password %> +

+

+ <%= f.submit %> +

+<% end %> +<%=link_to "Back to member list", members_path %> diff --git a/app/views/members/edit.html.erb b/app/views/members/edit.html.erb new file mode 100644 index 0000000..86a5850 --- /dev/null +++ b/app/views/members/edit.html.erb @@ -0,0 +1,2 @@ +

Edit member

+<%= render 'form' %> diff --git a/app/views/members/index.html.erb b/app/views/members/index.html.erb new file mode 100644 index 0000000..4114ccb --- /dev/null +++ b/app/views/members/index.html.erb @@ -0,0 +1,30 @@ +

Listing all members

+

+ <%=link_to "Create new member", new_member_path %> +

+ + + + + + <%@members.each do |member| %> + + + + + + + <% end %> +
+ Title + + Password +
+ <%=member.email%> + + <%=member.password%> + + <%=link_to "Edit", edit_member_path(member) %> + <%=link_to "Show", member_path(member) %> + <%=link_to "Delete", member_path(member), method: :delete, data: {confirm: "are you sure"} %> +
diff --git a/app/views/members/new.html.erb b/app/views/members/new.html.erb new file mode 100644 index 0000000..98b7907 --- /dev/null +++ b/app/views/members/new.html.erb @@ -0,0 +1,2 @@ +

Create a member

+<%= render 'form' %> diff --git a/app/views/members/show.html.erb b/app/views/members/show.html.erb new file mode 100644 index 0000000..f764185 --- /dev/null +++ b/app/views/members/show.html.erb @@ -0,0 +1,9 @@ +

Selected Member

+

+Title : <%=@member.email%> +

+

+Title : <%=@member.password%> +

+<%=link_to "Edit", edit_member_path(@member) %> | +<%=link_to "Back to member list", members_path %>