jinda 0.5.1 → 0.5.6

data/lib/generators/jinda/templates/app/controllers/jinda_org/notes_controller.rb

@@ -3,7 +3,8 @@ class NotesController < ApplicationController
   # before_action :xload_current_ma_user, only: [:destroy]
 
   def index
-    @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    # @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    @notes = Note
   end
 
   def my
@@ -20,8 +21,8 @@ class NotesController < ApplicationController
 
   def create
     @note = Note.new(
-      title: $xvars["new_note"]["title"],
-      body: $xvars["new_note"]["body"],
+      title: $xvars["new_note"]["note"]["title"],
+      body: $xvars["new_note"]["note"]["body"],
       user_id: $xvars["user_id"])
     @note.save!
     # if @note.save!
@@ -31,7 +32,6 @@ class NotesController < ApplicationController
     #   format.html { render :new }
     #   format.json { render json: @note.errors, status: :unprocessable_entity }
     # end
-    redirect_to @note
 
   end
 
@@ -42,10 +42,8 @@ class NotesController < ApplicationController
     # They contain everything that we get their forms select_note and edit_note
     note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
     @note = Note.find(note_id)
-    @note.update(title: $xvars["edit_note"]["title"],
-                 body: $xvars["edit_note"]["body"])
-    redirect_to @note
-
+    @note.update(title: $xvars["edit_note"]["note"]["title"],
+                 body: $xvars["edit_note"]["note"]["body"])
   end
 
   def delete

data/lib/generators/jinda/templates/app/jinda/index.mm

@@ -1,7 +1,7 @@
 <map version="1.0.1">
 <!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
 <node CREATED="1273819432637" ID="ID_1098419600" MODIFIED="1334737006485" TEXT="Jinda">
-<node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1583088810861" POSITION="right" TEXT="services">
+<node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1589756758387" POSITION="right" TEXT="services">
 <node CREATED="1275756501221" FOLDED="true" ID="ID_1720745721" MODIFIED="1583097151076" TEXT="users:User">
 <node CREATED="1278491598711" ID="ID_1662699954" MODIFIED="1494393920347" TEXT="role:m"/>
 <node CREATED="1279700865182" ID="ID_1266797279" MODIFIED="1357798847781" TEXT="link:info: /users"/>
@@ -25,7 +25,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1275752678377" FOLDED="true" ID="ID_1348489452" MODIFIED="1583097147577" TEXT="admins:Admin">
+<node CREATED="1275752678377" ID="ID_1348489452" MODIFIED="1588883079396" TEXT="admins:Admin">
 <node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
 <node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
 <node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
@@ -44,15 +44,54 @@
 <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
 <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
 </node>
-<node CREATED="1273706796854" FOLDED="true" ID="ID_1003882979" MODIFIED="1583097155227" TEXT="devs: Developer">
+<node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
 <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
 <node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
+<node CREATED="1275788317299" ID="ID_1570419198" MODIFIED="1587858894833" TEXT="link: notice_logs: /jinda/notice_logs"/>
 </node>
-<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
-<node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1581383331288" TEXT="link:My Notes: /notes/my">
+<node CREATED="1589756777499" ID="ID_853155456" MODIFIED="1589772589662" TEXT="docs: Document">
+<node CREATED="1589757073388" ID="ID_1938238774" MODIFIED="1589772640862" TEXT="link: My Document: /docs/my">
+<node CREATED="1589757125861" ID="ID_521286668" MODIFIED="1589757136547" TEXT="role:m"/>
+</node>
+<node CREATED="1589756879955" ID="ID_899042293" MODIFIED="1589910229085" TEXT="doc_new: New Document">
+<node CREATED="1589756946117" ID="ID_1840278804" MODIFIED="1589910235469" TEXT="doc_form: Doc Form">
+<icon BUILTIN="attach"/>
+<node CREATED="1589757054618" ID="ID_642998203" MODIFIED="1589757059003" TEXT="role: m"/>
+</node>
+<node CREATED="1589757264764" ID="ID_1352102524" MODIFIED="1589772413612" TEXT="doc_update: Doc update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1493419562726" ID="ID_339628868" MODIFIED="1590424956484" TEXT="doc_edit: Edit Document">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493419577933" ID="ID_801950372" MODIFIED="1590180699851" TEXT="doc_select: Select Document">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_761787946" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1493419612720" ID="ID_1190499756" MODIFIED="1590180735204" TEXT="doc_edit: Edit Document">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1216426484" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1581400438157" ID="ID_447781815" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_278169779" MODIFIED="1590180135106" TEXT="doc_xedit: Doc_hidden_menu">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493419612720" ID="ID_541432768" MODIFIED="1590180160498" TEXT="doc_edit: Edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1339913531" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1581400438157" ID="ID_802199910" MODIFIED="1590180242343" TEXT="doc_update: Doc_update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+<node CREATED="1493393619430" FOLDED="true" ID="ID_554831343" MODIFIED="1591392794806" TEXT="notes: Notes">
+<node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
 <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
-<node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1581180635669" TEXT="new: New Note">
+<node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1591278856955" TEXT="new: New Note">
 <node CREATED="1493419299004" ID="ID_723334321" MODIFIED="1581351169990" TEXT="new_note: New ">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479075294" ID="ID_1009521360" MODIFIED="1493479079687" TEXT="role:m"/>
@@ -60,8 +99,13 @@
 <node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_985992723" MODIFIED="1591319329198" TEXT="/notes/my">
+<arrowlink DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" SOURCE="ID_985992723" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
 </node>
-<node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
+</node>
+<node CREATED="1493419562726" FOLDED="true" ID="ID_1241171950" MODIFIED="1591278847249" TEXT="edit: Edit">
 <node CREATED="1493419577933" ID="ID_1790163920" MODIFIED="1581350888992" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_1289003986" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -74,7 +118,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1495246388313" ID="ID_320521408" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
+<node CREATED="1495246388313" FOLDED="true" ID="ID_320521408" MODIFIED="1591278851391" STYLE="fork" TEXT="delete:Delete">
 <edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
 <node CREATED="1493419577933" ID="ID_1631275659" MODIFIED="1581350942681" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
@@ -84,7 +128,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1581531446494" ID="ID_1325232876" MODIFIED="1581715693485" TEXT="mail: Mail">
+<node CREATED="1581531446494" FOLDED="true" ID="ID_1325232876" MODIFIED="1591278853597" TEXT="mail: Mail">
 <node CREATED="1493419577933" FOLDED="true" ID="ID_1817148049" MODIFIED="1581531563343" TEXT="select_note: Select">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_1650154281" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -96,7 +140,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1495246388313" ID="ID_807216843" MODIFIED="1585001129104" TEXT="xedit: Future use">
+<node CREATED="1495246388313" FOLDED="true" ID="ID_807216843" MODIFIED="1590180066630" TEXT="xedit: Future use">
 <icon BUILTIN="button_cancel"/>
 <node CREATED="1493419612720" ID="ID_6864095" MODIFIED="1584999031935" TEXT="edit_note: Edit">
 <icon BUILTIN="attach"/>
@@ -107,12 +151,12 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1585001518753" TEXT="articles: Article">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_328863650" MODIFIED="1591392789585" TEXT="articles: Article">
 <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
-<node CREATED="1493489768542" ID="ID_1376361427" MODIFIED="1493768994418" TEXT="link: My article: /articles/my">
+<node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
 <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
-<node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1493489729876" TEXT="new_article: New Article">
+<node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
 <node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
@@ -120,8 +164,13 @@
 <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_657878492" MODIFIED="1591319807025" TEXT="/articles/my">
+<arrowlink DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" SOURCE="ID_657878492" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
+</node>
 </node>
-<node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1493490306480" TEXT="edit_article: Edit Article">
+<node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1590180584955" TEXT="edit_article: Edit Article">
 <node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479602815" ID="ID_753056881" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -145,8 +194,10 @@
 </node>
 </node>
 </node>
-<node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1583091848193" TEXT="comments: Comment">
-<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1493665186791" TEXT="new_comment: New Comment">
+<node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1591392798294" TEXT="comments: Comment">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
+<icon BUILTIN="button_cancel"/>
 <node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
 <icon BUILTIN="bookmark"/>
 <node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
@@ -180,8 +231,9 @@
 <node CREATED="1494172758253" ID="ID_961056168" MODIFIED="1494172797972" TEXT="sitemap: Sitemap"/>
 <node CREATED="1494393494180" ID="ID_242460166" MODIFIED="1494393504971" TEXT="role:a"/>
 </node>
-<node CREATED="1493393619430" ID="ID_35210833" MODIFIED="1585089057213" TEXT="api/v1/notes: Notes API ">
-<node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1582131857208" TEXT="link:My Notes: /api/v1/notes/my">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_35210833" MODIFIED="1591392800862" TEXT="api/v1/notes: Notes API ">
+<node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1591074318558" TEXT="link:My Notes: /api/v1/notes/my">
+<icon BUILTIN="button_cancel"/>
 <node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
 <node CREATED="1493419257021" ID="ID_1182560700" MODIFIED="1581180635669" TEXT="new: New Note">
@@ -194,10 +246,6 @@
 </node>
 </node>
 <node CREATED="1493419562726" ID="ID_963001770" MODIFIED="1581180788218" TEXT="edit: Edit">
-<node CREATED="1493419577933" ID="ID_1640736660" MODIFIED="1581350888992" TEXT="select_note: Select">
-<icon BUILTIN="attach"/>
-<node CREATED="1493479602815" ID="ID_1623444138" MODIFIED="1493479606921" TEXT="role:m"/>
-</node>
 <node CREATED="1493419612720" ID="ID_1362613316" MODIFIED="1581350996674" TEXT="edit_note: Edit">
 <icon BUILTIN="attach"/>
 <node CREATED="1493479557266" ID="ID_1838104057" MODIFIED="1493479561055" TEXT="role:m"/>
@@ -223,7 +271,7 @@
 <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
 <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
 </node>
-<node CREATED="1273819456867" ID="ID_1677010054" MODIFIED="1493418874718" POSITION="left" TEXT="models">
+<node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
 <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
 <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
 <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>

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/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/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>