jinda 0.3.9 → 0.4.0

data/lib/generators/jinda/templates/app/controllers/{jinda-org → jinda_org}/sessions_controller.rb

@@ -4,6 +4,10 @@ class SessionsController < ApplicationController
     @title= 'Sign In'
   end
 
+  def failure
+    redirect_to login_path, alert: "Authentication failed, please try again."
+  end
+
   # to refresh the page, must know BEFOREHAND that the action needs refresh
   # then use attribute 'data-ajax'=>'false'
   # see app/views/sessions/new.html.erb for sample

data/lib/generators/jinda/templates/app/jinda/template/view.html.erb

@@ -1,23 +1,27 @@
-<%#
-  doc = Doc.new :issue_on=> Date.today, :process_at => Time.now
+<%
+  doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
 %>
-<%#= fields_for doc do |f| %>
-  <%#= f.label :rnum, "Reference number" %>
-  <%#= f.text_field :rnum %>
+<%= fields_for doc do |f| %>
+
+    <%= f.select :x, [["SELECTION 1", 1], ["SELECTION  2", 2], ["SELECTION  3", 3]] %>
+
+
+  <%= f.label :x, "Reference number" %>
+  <%= f.text_field :x %>
   <!--div>
-    <%#= f.label :confidential, "Confidentiality" , :class=>"ui-input-text" %>
-    <%#= f.select :confidential, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+    <%= f.label :w, "Confidential" , :class=>"ui-input-text" %>
+    <%= f.select :w, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
   </div-->
-  <%#= f.label :issue_on, "Dated" %>
-  <%#= f.date_field :issue_on, "blackDays"=>[0,6] %>
-  <%#= f.label :summary, "Summary" %>
-  <%#= f.text_area :summary, :cols=>50, :rows=>6 %>
-  <%#= f.label :dscan, "Attached document" %>
-  <%#= f.file_field :dscan %>
-<%# end %>
-<%#= label_tag :hotel, "Ungroup field" %>
-<%#= text_field_tag :hotel %>
+  <%= f.label :issue_on, "Dated" %>
+  <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+  <%= f.label :y, "Summary" %>
+  <%= f.text_area :summary, :cols=>50, :rows=>6 %>
+  <%= f.label :dscan, "Attached document" %>
+  <%= f.file_field :dscan %>
+<% end %>
+<%= label_tag :z, "Ungroup field" %>
+<%= text_field_tag :z %>
 <!--div>
-  <%#= label_tag :done1, "Logic field", :class=>"ui-input-text" %>
-  <%#= select_tag :done1, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  <%= label_tag :yes, "Logic field", :class=>"ui-input-text" %>
+  <%= select_tag :yes, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
 </div-->

data/lib/generators/jinda/templates/app/models/jinda/doc.rb

@@ -1,31 +1,22 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 class Jinda::Doc
   include Mongoid::Document
+  # jinda begin
   include Mongoid::Timestamps
-  field :name, :type => String
-  field :filename, :type => String
-  field :content_type, :type => String
-  field :data_text, :type => String
-  field :url, :type => String
-  field :basename, :type => String
-  field :cloudinary, :type => Boolean
-  belongs_to :xmain, :class_name => "Jinda::Xmain"
-  belongs_to :runseq, :class_name => "Jinda::Runseq"
-  belongs_to :user, :class_name => "Jinda::User"
-  belongs_to :service, :class_name => "Jinda::Service"
-  field :ip, :type => String
-  field :ma_display, :type => Boolean
-  field :ma_secured, :type => Boolean
-
-  def self.search(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ? AND (ma_secured=? OR ma_user_id=?)",
-      "output", "%#{q}%", false, session[:user_id] ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
-  end
-  def self.search_ma_secured(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ?", "output", "%#{q}%" ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
-  end
+  field :a, :type => String
+  field :b, :type => String
+  field :c, :type => String
+  field :d, :type => String
+  field :x, :type => String
+  field :y, :type => String
+  field :z, :type => String
+  field :s, :type => String
+  field :t, :type => String
+  field :u, :type => String
+  field :w, :type => String
+  field :yes, :type => Boolean
+  field :dscan, :type => String
+  field :process_at, :type => Date
+  field :issue_on, :type => Date
+  # jinda end
 end

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml

@@ -13,15 +13,15 @@
 
   %h2 Recently tested with:
   %ul  
-    %li Rubygems 2.5.5
-    %li Rails 5.2.3
+    %li Rubygems 2.6.3
+    %li Rails 6.0.0
     %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks 
     %li (rails new YOURAPP -BOTJ)
 
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.3.9'
+    %li add gem 'jinda', '0.4.0'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )