From d5efe1402fb88ce4a2be01c3b76c98bbf84017e0 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 6 Nov 2017 18:23:38 +0630
Subject: [PATCH] add survey

---
 app/assets/javascripts/origami/surveys.coffee |  3 +++
 app/assets/stylesheets/origami/surveys.scss   |  3 +++
 app/controllers/origami/surveys_controller.rb |  2 ++
 app/helpers/origami/surveys_helper.rb         |  2 ++
 app/models/survey.rb                          |  2 ++
 app/views/oqs/home/index.html.erb             |  1 -
 db/migrate/20171106110505_create_surveys.rb   | 20 +++++++++++++++++++
 .../origami/surveys_controller_spec.rb        |  5 +++++
 spec/helpers/origami/surveys_helper_spec.rb   | 15 ++++++++++++++
 spec/models/survey_spec.rb                    |  5 +++++
 10 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/origami/surveys.coffee
 create mode 100644 app/assets/stylesheets/origami/surveys.scss
 create mode 100644 app/controllers/origami/surveys_controller.rb
 create mode 100644 app/helpers/origami/surveys_helper.rb
 create mode 100644 app/models/survey.rb
 create mode 100644 db/migrate/20171106110505_create_surveys.rb
 create mode 100644 spec/controllers/origami/surveys_controller_spec.rb
 create mode 100644 spec/helpers/origami/surveys_helper_spec.rb
 create mode 100644 spec/models/survey_spec.rb

diff --git a/app/assets/javascripts/origami/surveys.coffee b/app/assets/javascripts/origami/surveys.coffee
new file mode 100644
index 00000000..24f83d18
--- /dev/null
+++ b/app/assets/javascripts/origami/surveys.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/origami/surveys.scss b/app/assets/stylesheets/origami/surveys.scss
new file mode 100644
index 00000000..855b567c
--- /dev/null
+++ b/app/assets/stylesheets/origami/surveys.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Origami/Surveys controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
new file mode 100644
index 00000000..5742670e
--- /dev/null
+++ b/app/controllers/origami/surveys_controller.rb
@@ -0,0 +1,2 @@
+class Origami::SurveysController < ApplicationController
+end
diff --git a/app/helpers/origami/surveys_helper.rb b/app/helpers/origami/surveys_helper.rb
new file mode 100644
index 00000000..39fe06b8
--- /dev/null
+++ b/app/helpers/origami/surveys_helper.rb
@@ -0,0 +1,2 @@
+module Origami::SurveysHelper
+end
diff --git a/app/models/survey.rb b/app/models/survey.rb
new file mode 100644
index 00000000..27b6229e
--- /dev/null
+++ b/app/models/survey.rb
@@ -0,0 +1,2 @@
+class Survey < ApplicationRecord
+end
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index d281a627..3e03f84d 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -415,4 +415,3 @@
   });
 });
 </script> -->
->>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249
diff --git a/db/migrate/20171106110505_create_surveys.rb b/db/migrate/20171106110505_create_surveys.rb
new file mode 100644
index 00000000..639322f5
--- /dev/null
+++ b/db/migrate/20171106110505_create_surveys.rb
@@ -0,0 +1,20 @@
+class CreateSurveys < ActiveRecord::Migration[5.1]
+  def change
+    create_table :surveys do |t|
+      t.string :dining_name
+      t.string :receipt_no
+      t.integer :shift_id
+      t.string :created_by
+      t.integer :child
+      t.integer :adult
+      t.integer :male
+      t.integer :female
+      t.json :foreigner
+      t.integer :local
+      t.integer :total_customer
+      t.decimal :total_amount
+
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/controllers/origami/surveys_controller_spec.rb b/spec/controllers/origami/surveys_controller_spec.rb
new file mode 100644
index 00000000..d37dca8b
--- /dev/null
+++ b/spec/controllers/origami/surveys_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::SurveysController, type: :controller do
+
+end
diff --git a/spec/helpers/origami/surveys_helper_spec.rb b/spec/helpers/origami/surveys_helper_spec.rb
new file mode 100644
index 00000000..bb0235db
--- /dev/null
+++ b/spec/helpers/origami/surveys_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::SurveysHelper. For example:
+#
+# describe Origami::SurveysHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::SurveysHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/survey_spec.rb b/spec/models/survey_spec.rb
new file mode 100644
index 00000000..a3baabdb
--- /dev/null
+++ b/spec/models/survey_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Survey, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end