jinda 0.5.2 → 0.5.7

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

@@ -1,27 +1,26 @@
 <%
-  doc = Jinda::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.select :x, [["SELECTION 1", 1], ["SELECTION  2", 2], ["SELECTION  3", 3]] %>
-
-
-  <%= f.label :x, "Reference number" %>
-  <%= f.text_field :x %>
+  <%= f.label :category, "Category" %>
+  <%= f.select :category, [["Book", "book"], ["Letter", "letter"], ["Brochure", "brochure"]] %>
   <!--div>
-    <%= 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 :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 :yes, "Logic field", :class=>"ui-input-text" %>
-  <%= select_tag :yes, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
-</div-->
+    </div-->
+    <%= f.label :issue_on, "Dated" %>
+    <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+
+    <%= f.label :dscan, "Attached document" %>
+    <%= f.file_field :dscan %>
+  <% end %>
+  <div>
+  <%= label_tag :description, "Description" %>
+  <%= text_field_tag :description %>
+  </div>
+  <div>
+    <%= label_tag :ma_display, "Display", :class=>"ui-input-text" %>
+    <%= select_tag :ma_display, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  </div>
+  <div>
+  <%= label_tag :keywords, "Search Keywords" %>
+  <%= text_field_tag :keywords %>
+  </div>

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

@@ -2,6 +2,7 @@
 class Jinda::Doc
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Mongoid::Attributes::Dynamic
   field :name, :type => String
   field :filename, :type => String
   field :content_type, :type => String
@@ -14,8 +15,12 @@ class Jinda::Doc
   belongs_to :user
   belongs_to :service, :class_name => "Jinda::Service"
   field :ip, :type => String
+  field :description, :type => String
+  field :category, :type => String
   field :ma_display, :type => Boolean
   field :ma_secured, :type => Boolean
+  field :dscan, :type => String
+  field :keywords, :type => String
 
   def self.search(q, page, per_page=PER_PAGE)
     paginate :per_page=>per_page, :page => page, :conditions =>

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

@@ -11,7 +11,7 @@
   - @articles.each do |article|
     %tr
       %td= article.user.code if article.user
-      %td= link_to article.title, :controller=>"articles", :action=>"show", :id=>article.id
+      %td= link_to article.title, :controller=>"articles", :action=>"show", :article_id=>article.id
       %td= article.text
       %td= article.created_at
       %td= article.updated_at
@@ -20,4 +20,4 @@
         - unless current_ma_user.role.upcase.split(',').include?("A")
           - next unless article.user
           - next unless current_ma_user == article.user
-        = link_to image_tag('delete.png', style:'border:none; float:none;'), "#", :onclick=>"if (confirm('Please Confirm')) {location.hash='/articles/destroy/#{article.id}';}"
+        = link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "articles", action: "destroy",  article_id: article.id}, data: { confirm: "Please Confirm" }

data/lib/generators/jinda/templates/app/views/articles/my.haml

@@ -1,7 +1,7 @@
 - @title= "My Articles"
 %p
 - @page_title  = 'All Articlces'
-= paginate @articles
+= paginate @my_articles
 %table#article-table
   %tr
     %th Title
@@ -10,9 +10,9 @@
     %th Updated
     %th Delete
     %th Edit  
-  - @articles.each do |article|
+  - @my_articles.each do |article|
     %tr
-      %td= link_to article.title, :controller=>"articles", :action=>"show", :id=>article.id
+      %td= link_to article.title, :controller=>"articles", :action=>"show", :article_id => article.id
       %td= article.text.html_safe
       %td= article.created_at.strftime('%m/%d/%Y')
       %td= article.updated_at.strftime('%m/%d/%Y')

data/lib/generators/jinda/templates/app/views/articles/new_article/form_article.html.erb

@@ -2,13 +2,15 @@
 <%
   article = @article
 %>
+<div id="article-table">
 <%= fields_for article do |f| %>
   <%= f.label :title, "Title" %>
-  <%= f.text_field :title %>
+  <%= f.text_field :title, :required => true %>
   <%= f.label :text, "Description" %>
-  <%= f.text_field :text %>
+  <%= f.text_field :text, :required => true %>
   <%= f.label :text, "Keywords" %>
   <%= f.text_field :keywords %>
   <%= f.label :body, "Body Content" %>
-  <%= f.text_area :body %>
+  <%= f.text_area :body, :required => true %>
 <% end %>
+</div>

data/lib/generators/jinda/templates/app/views/articles/show.html.haml

@@ -7,18 +7,19 @@
 
 #article-text= @article.body.html_safe
 
-= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: @article.id}, data: { confirm: "Please Confirm" }
+= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "comments", action: "create", article_id: @article.id}, data: { confirm: "Please Confirm" }
 - @comments.each do |comment|
   %div#article-comment.ui-corner-all
     Author:    
     %b= comment.user.code if comment.user
     %div#comment-body
       %i= comment.body
-
+-# 
 - if login?
   %h3 Add a comment:
-  = form_for @article.comments.build, url: "/jinda/init?s=comments:new_comment" do |f|
+  = form_for([@comment, @article.comments.build]) do |f|
     = f.hidden_field :article_id, :value => @article.id
     = f.label :body, "Comment"
     = f.text_area :body
+    = f.hidden_field :user_id, :value => current_ma_user
     = f.submit

data/lib/generators/jinda/templates/app/views/docs/doc_edit/doc_edit.html.erb

@@ -0,0 +1,21 @@
+<%
+    doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
+%>
+<%= fields_for doc do |f| %>
+  <%= f.label :content_type, "Content type" %>
+  <%= f.select :content_type, [["pdf file", "pdf"], ["png file", "png"], ["html file", "html"]] %>
+  <!--div>
+    </div-->
+    <%= f.label :issue_on, "Dated" %>
+    <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+
+    <%= f.label :dscan, "Attached document" %>
+    <%= f.file_field :dscan %>
+    <%= f.label :filename, "File Name" %>
+  <% end %>
+  <%= label_tag :x, "x field" %>
+  <%= text_field_tag :x %>
+  <div>
+    <%= label_tag :ma_display, "Display", :class=>"ui-input-text" %>
+    <%= select_tag :ma_display, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  </div>

data/lib/generators/jinda/templates/app/views/docs/doc_edit/doc_select.html.erb

@@ -0,0 +1,14 @@
+
+<%
+  if current_ma_user.role.upcase.split(',').include?("A")
+    note= Jinda::Doc.all.desc(:created_at)
+  else
+    note= Jinda::Doc.where(user: current_ma_user).desc(:created_at)
+  end
+%>
+<div class="field" data-role="fieldcontain">
+  <%= label_tag :filename, 'Select Document' %>
+  <br>
+  <br>
+  <%= select_tag :id, options_from_collection_for_select(note, :id, :filename), "notee-menu"=>"false" %>
+</div>

data/lib/generators/jinda/templates/app/views/docs/doc_new/doc_form.html.erb

@@ -0,0 +1,26 @@
+<%
+    doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
+%>
+<%= fields_for doc do |f| %>
+  <%= f.label :category, "Category" %>
+  <%= f.select :category, [["Book", "book"], ["Letter", "letter"], ["Brochure", "brochure"]] %>
+  <!--div>
+    </div-->
+    <%= f.label :issue_on, "Dated" %>
+    <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+
+    <%= f.label :dscan, "Attached document" %>
+    <%= f.file_field :dscan %>
+  <% end %>
+  <div>
+  <%= label_tag :description, "Description" %>
+  <%= text_field_tag :description %>
+  </div>
+  <div>
+    <%= label_tag :ma_display, "Display", :class=>"ui-input-text" %>
+    <%= select_tag :ma_display, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  </div>
+  <div>
+  <%= label_tag :keywords, "Search Keywords" %>
+  <%= text_field_tag :keywords %>
+  </div>

data/lib/generators/jinda/templates/app/views/docs/doc_new/doc_form.md

@@ -0,0 +1,36 @@
+<style>code { font-size: 0.8em;}</style>
+
+<%= File.read('README.md') %>
+
+***
+
+# Help (UNDER CONSTRUCTION: DUI)
+
+<%= render :partial=>'jinda/modul.md', :collection=> Jinda::Module.all.asc(:seq) %>
+
+***
+
+# Admin 
+
+## Data Structure
+
+<%- models= @app.elements["//node[@TEXT='models']"] %>
+
+<%= render :partial=>'jinda/model.md', :collection=> models.map {|m| m.attributes["TEXT"] } %>
+
+***
+
+# Contents
+
+## markdown
+
+This document created and edited with 
+<a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">markdown</a>
+
+Contents:
+
+* Requirement at `README.md`
+* Controller Help at  `app/controllers/system.md`
+* Project at  `app/views/project/<งาน>.md`
+*
+*

data/lib/generators/jinda/templates/app/views/docs/doc_xedit/doc_edit.html.erb

@@ -0,0 +1,21 @@
+<%
+    doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
+%>
+<%= fields_for doc do |f| %>
+  <%= f.label :content_type, "Content type" %>
+  <%= f.select :content_type, [["pdf file", "pdf"], ["png file", "png"], ["html file", "html"]] %>
+  <!--div>
+    </div-->
+    <%= f.label :issue_on, "Dated" %>
+    <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+
+    <%= f.label :dscan, "Attached document" %>
+    <%= f.file_field :dscan %>
+    <%= f.label :filename, "File Name" %>
+  <% end %>
+  <%= label_tag :x, "x field" %>
+  <%= text_field_tag :x %>
+  <div>
+    <%= label_tag :ma_display, "Display", :class=>"ui-input-text" %>
+    <%= select_tag :ma_display, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  </div>

data/lib/generators/jinda/templates/app/views/docs/edit/select_note.html.erb

@@ -0,0 +1,14 @@
+
+<%
+  if current_ma_user.role.upcase.split(',').include?("A")
+    note= Note.all.desc(:created_at)
+  else
+    note= Note.where(user: current_ma_user).desc(:created_at)
+  end
+%>
+<div class="field" data-role="fieldcontain">
+  <%= label_tag :title, 'Select Note' %>
+  <br>
+  <br>
+  <%= select_tag :id, options_from_collection_for_select(note, :id, :title), "notee-menu"=>"false" %>
+</div>

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

@@ -0,0 +1,21 @@
+- @title= "My Articles"
+%p
+- @page_title  = 'All Articlces'
+= paginate @articles
+%table#article-table
+  %tr
+    %th Title
+    %th Description
+    %th Created
+    %th Updated
+    %th Delete
+    %th Edit  
+  - @articles.each do |article|
+    %tr
+      %td= link_to article.title, :controller=>"articles", :action=>"show", :id=>article.id
+      %td= article.text.html_safe
+      %td= article.created_at.strftime('%m/%d/%Y')
+      %td= article.updated_at.strftime('%m/%d/%Y')
+      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), "#", :onclick=>"if (confirm('Please Confirm')) {location.hash='/articles/destroy/#{article.id}';}"
+      %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: article.id}, data: { confirm: "Please Confirm" }
+

data/lib/generators/jinda/templates/app/views/docs/my.haml

@@ -0,0 +1,27 @@
+- @title= "My Documents"
+%p
+- @page_title  = 'All Documents'
+= paginate @docs
+%table#document-table
+  %tr
+    %th File Name
+    %th Description
+    %th Category
+    %th Created
+    %th Delete
+    %th Edit  
+  - @docs.each do |doc|
+    %tr
+      - @temp = doc.dscan
+      - if !@temp.blank?
+        - @dscan = @temp.scan(/document\/([^*]*)/).last.last
+        %td= link_to doc.filename, "#{jinda_document_path}?id=#{@dscan}", target: :_blank
+      - else
+        %td= doc.filename
+      %td= doc.description
+      %td= doc.category
+      %td= doc.created_at.strftime('%m/%d/%Y')
+      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "docs", action: "destroy",  doc_id: doc.id}, data: { confirm: "Please Confirm" }
+      %td(align='center')= image_tag('pencil.png', style:'border:none; float:none;')
+      - # To do
+      - # %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'docs:xedit_doc', doc_id: doc.id}, data: { confirm: "Please Confirm" }

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

@@ -13,15 +13,15 @@
 
   %h2 Recently tested with:
   %ul  
-    %li Rubygems 2.7.0
-    %li Rails 6.0.2
+    %li Rubygems 2.7.1
+    %li Rails 6.0.3
     %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.5.2'
+    %li add gem 'jinda', '0.5.7'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/generators/jinda/templates/app/views/jinda/run_output.haml

@@ -22,7 +22,7 @@
       %th= t "user"
       %th= "date"
     - @xmain.docs.each do |doc|
-      - next unless doc.display
+      - next unless doc.ma_display
       %tr
         %td= doc.id
         %td
@@ -32,7 +32,7 @@
             = image_tag 'page_attach.png'
           = link_to_blank align_text(doc.name), :controller=>"jinda", :action=>:document, :id=>doc.id
         %td= doc.filename
-        %td= doc.user.name
-        %td= date_thai doc.updated_at
+        %td= doc.user.code
+        %td= doc.updated_at
   = submit_tag @message
 %p

data/lib/generators/jinda/templates/app/views/layouts/_head.html.erb

@@ -1,13 +1,10 @@
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="distribution" content="global" />
-  <meta name="robots" content="follow, all" />
-  <meta name="language" content="en, th" />
-  <title>eLocal</title>
-  <link rel="shortcut icon" href="/assets/favicon.ico" />
-  <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
-  <%= stylesheet_link_tag "jinda", "sarabun" %>
+  <%= favicon_link_tag %>
+  <%= csrf_meta_tags %>
+  <%= meta_tags %> 
   <meta name="description" content="Jinda" />
-  <%= javascript_include_tag "jquery.tools.min.js"  %>
-  <%= javascript_include_tag "application", "flashobject", "FusionCharts"  %>
+  <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track":"reload" %>
+  <%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>
+  <%= stylesheet_link_tag "jinda", "sarabun" %>
+  <script src = "https://ajax.aspnetcdn.com/ajax/jquery.validate/1.12.0/jquery.validate.js" ></script>
 </head>

data/lib/generators/jinda/templates/app/views/layouts/jqm/_full.haml

@@ -1,15 +1,7 @@
 !!! 5
 %html
   %head
-    = favicon_link_tag
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
-    = javascript_include_tag "application", 'data-turbolinks-track': 'reload' 
-    = csrf_meta_tags
-    = display_meta_tags 
-    - if GMAP
-      = javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false"
-    -# if ADSENSE
-      = render :partial => 'custom/adsense'        
+    = render :partial => "layouts/head"
   %body
     = render :partial => "jinda/menu"
     %div{"data-id" => "main", "data-role" => "panel", "data-backbtn"=>"false"}

data/lib/generators/jinda/templates/app/views/notes/new/new_note.html.erb

@@ -6,7 +6,7 @@
     
   <%= fields_for doc, validate: true  do |f| %>
   <%= f.label :title, "Title" %>
-  <%= f.text_field :title %><Br>
+  <%= f.text_field :title, :required => true %><Br>
   <%= f.label :body, "Body Content" %>
   <%= f.text_area :body, :cols=>50, :rows=>6, required: true  %>
 <% end %>

data/lib/jinda/helpers.rb

@@ -107,7 +107,7 @@ module Jinda
         return false unless action
         i= i + 1
         output_ma_display= false
-        if action=='output'
+        if action== ('output'|| 'list' ||'folder')
           ma_display= get_option_xml("display", activity)
           if ma_display && !affirm(ma_display)
             output_ma_display= false
@@ -166,19 +166,6 @@ module Jinda
       @runseq.save
     end
 
-    def document
-      doc = Jinda::Doc.find params[:id]
-      if doc.cloudinary
-        require 'net/http'
-        require "uri"
-        uri = URI.parse(doc.url)
-        data = Net::HTTP.get_response(uri)
-        send_data(data.body, :filename=>doc.filename, :type=>doc.content_type, :disposition=>"inline")
-      else
-        data= read_binary(doc.url)
-        send_data(data, :filename=>doc.filename, :type=>doc.content_type, :disposition=>"inline")
-      end
-    end
     def b(s)
       "<b>#{s}</b>".html_safe
     end
@@ -212,6 +199,7 @@ module Jinda
     def redirect_to_root
       redirect_to root_path
     end
+
     # Todo refactor code
     def get_option(opt, runseq=@runseq)
       xml= REXML::Document.new(runseq.xml).root
@@ -306,6 +294,7 @@ module Jinda
       step1 = REXML::Document.new(xml).root.elements['node']
       role= get_option_xml("role", step1) || ""
       #    rule= get_option_xml("rule", step1) || true
+      rule= get_option_xml("rule", step1) || true
       return true if role==""
       unless current_ma_user
         return role.blank?
@@ -313,6 +302,7 @@ module Jinda
         return false unless current_ma_user.role
         return current_ma_user.has_role(role)
       end
+
     end
     def ma_log(message)
       #  Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
@@ -851,11 +841,16 @@ module Jinda
       when 'help' # Question
         'if'
       when 'forward' # Forward
-        'redirect'
+        # 'redirect'
+        'direct_to'
       when 'kaddressbook' #Phone
         'invoke' # invoke new service along the way
-      when 'list' # Output
+      when 'idea' # output
         'output'
+      when 'list' # List
+        'list'
+      when 'folder' # Folder
+        'folder'
       when 'mail'
         'mail'
       when 'xmag' # Tobe discussed