jinda 0.5.4 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/lib/generators/jinda/install_generator.rb +1 -0
  4. data/lib/generators/jinda/templates/app/assets/stylesheets/app.scss +11 -5
  5. data/lib/generators/jinda/templates/app/assets/stylesheets/articles.scss +16 -6
  6. data/lib/generators/jinda/templates/app/controllers/concerns/jinda_run_concern.rb +14 -0
  7. data/lib/generators/jinda/templates/app/controllers/jinda_org/docs_controller.rb +1 -0
  8. data/lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb +1 -0
  9. data/lib/generators/jinda/templates/app/controllers/jinda_org/notes_controller.rb +2 -1
  10. data/lib/generators/jinda/templates/app/jinda/index.mm +22 -14
  11. data/lib/generators/jinda/templates/app/views/articles/new_article/form_article.html.erb +2 -0
  12. data/lib/generators/jinda/templates/app/views/jinda/index.html.haml +1 -1
  13. data/lib/jinda/helpers.rb +3 -1
  14. data/lib/jinda/version.rb +1 -1
  15. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a17b43b4b898dae67bb7c0f10f5ac9b0b4dc804b4d724a98de77575aff7a6122
4
- data.tar.gz: e9e61b49a95d6a88ded3051d4b2f9f55d74fca6be0ee8f07b99f3103bd3e4d6d
3
+ metadata.gz: 22a5bc38b0cb1b8d762c12992113c2c7ff7a32a561ffa40e2d0bffc33c4ef3ab
4
+ data.tar.gz: 72e62d233e7caf07a108b7a2a1cdfba7b837724215332a66e625c950f806c9f7
5
5
  SHA512:
6
- metadata.gz: 8490aa2e9ef93bdd6b7fadfd6a49fbdf53b4799e11b1b3f26de526b6e4d06aaf83f82cb22081c885951c2097c5e4fbd68241413bc3a55d1e2c3d81afc694d896
7
- data.tar.gz: a29f70fc72a7785a8997720e9231aed38ba145fee7e17fccc5fdbb83af99404c7e912f397129eb656b45f0909eea209f7e35ed0a8f879d0b3415422112d560e6
6
+ metadata.gz: 1eb303b8a9a49ff57fc98dcbceeb12982bd2f7686fc653b996da5212ee8189a9d3a66f7809db839d85f5e45e278f43c54e90deeab74b83aa268b0fbae0ef220d
7
+ data.tar.gz: 9ce2e36e149bcde4620bcdb1cb29a0b38847055c8ae746af0dfc4201e866cdfbe4a07460f9957354fc1f5023427ed4348c012233b50e648d847d6f28068817b6
data/README.md CHANGED
@@ -40,7 +40,7 @@ app without ActiveRecord
40
40
 
41
41
  ## Add jinda to your Gemfile:
42
42
 
43
- gem 'jinda', '~> 0.5.4'
43
+ gem 'jinda', '~> 0.5.5'
44
44
 
45
45
  For Development (most updated)
46
46
 
data/lib/generators/jinda/install_generator.rb CHANGED
@@ -130,6 +130,7 @@ module Jinda
130
130
  route "post '/jinda/init' => 'jinda#init'"
131
131
  route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
132
132
  route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
133
+ route "jinda_methods += ['run_redirect', 'run_direct_to']"
133
134
  route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
134
135
  route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"
135
136
  route "\# start jiinda method routes"
data/lib/generators/jinda/templates/app/assets/stylesheets/app.scss CHANGED
@@ -1,14 +1,19 @@
1
1
 
2
+ #article-title {
3
+ text-align: left;
4
+ font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
5
+ color:#333;
6
+ }
7
+
2
8
  #title {
3
9
  font-size: 14pt;
4
10
  font-weight: bold;
5
- text-align: center;
6
- background: #d2f0ff;
11
+ text-align: left;
7
12
  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
8
13
  color:#333;
9
14
 
10
15
  }
11
- #text {
16
+ #text{
12
17
  font-size: 14pt;
13
18
  font-weight: bold;
14
19
  text-align:left;
@@ -41,7 +46,6 @@
41
46
  #table th {
42
47
  background-color: #bcecff;
43
48
  color:#333;
44
- ;
45
49
  width:100%;
46
50
  }
47
51
 
@@ -59,12 +63,14 @@
59
63
  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
60
64
  /*font-size: 110%;*/
61
65
  }
62
- .ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 15px; display: block; }
66
+ .ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 7px; display: block; }
63
67
  .ui-link-inherit { font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;}
64
68
  label.ui-input-text {
65
69
  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
66
70
  /*font-size: 110%;*/
67
71
  text-shadow: none;
72
+ margin: 2% 2% 0 0;
73
+
68
74
  }
69
75
  label.ui-select {
70
76
  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
data/lib/generators/jinda/templates/app/assets/stylesheets/articles.scss CHANGED
@@ -1,16 +1,28 @@
1
1
 
2
- #article-title {
2
+
3
+ #article-table {
3
4
  font-size: 14pt;
4
5
  font-weight: bold;
5
- text-align: center;
6
- background: #d2f0ff;
6
+ text-align: left;
7
+ background:#f7f7f7;
7
8
  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
9
+ padding:2px 5px;
8
10
  color:#333;
9
11
 
10
12
  }
11
- #article-text {
13
+
14
+ #article-title {
12
15
  font-size: 14pt;
13
16
  font-weight: bold;
17
+ text-align: left;
18
+ background:#f7f7f7;
19
+ font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
20
+ padding:2px 5px;
21
+ color:#333;
22
+
23
+ }
24
+ #article-text {
25
+ font-size: 8pt;
14
26
  text-align:left;
15
27
  border:1px solid #c1c1c1;
16
28
  background:#f7f7f7;
@@ -28,7 +40,6 @@
28
40
 
29
41
  #comment-body {
30
42
  font-size: 10pt;
31
- font-weight: bold;
32
43
  text-align:left;
33
44
  color:#333;
34
45
  }
@@ -41,7 +52,6 @@
41
52
  #article-table th {
42
53
  background-color: #bcecff;
43
54
  color:#333;
44
- ;
45
55
  width:100%;
46
56
  }
47
57
 
data/lib/generators/jinda/templates/app/controllers/concerns/jinda_run_concern.rb CHANGED
@@ -60,6 +60,20 @@ module JindaRunConcern
60
60
  end_action(next_runseq)
61
61
  end
62
62
 
63
+ # redirect when finish last runseq
64
+ # eg: http://localhost:3000/notes/my
65
+ def run_direct_to
66
+ init_vars(params[:id])
67
+ next_runseq= @xmain.runseqs.where(:id.ne=>@runseq.id, :code=>@runseq.code).first
68
+ if !@runseq.code.blank?
69
+ @xvars['p']['return'] = @runseq.code
70
+ else
71
+ flash[:notice]= "Error: missing required forward path in Freemind"
72
+ ma_log "Error: require forward path in Freemind"
73
+ end
74
+ end_action(next_runseq)
75
+ end
76
+
63
77
  def run_redirect
64
78
  init_vars(params[:id])
65
79
  # next_runseq= @xmain.runseqs.first :conditions=>["id != ? AND code = ?",@runseq.id, @runseq.code]
data/lib/generators/jinda/templates/app/controllers/jinda_org/docs_controller.rb CHANGED
@@ -14,6 +14,7 @@ class DocsController < ApplicationController
14
14
  end
15
15
 
16
16
  def doc_update
17
+ # Instead of creaete, Doc record was created in form, when upload file
17
18
 
18
19
  if Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).exists?
19
20
  @doc = Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).first
data/lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb CHANGED
@@ -23,6 +23,7 @@ class JindaController < ApplicationController
23
23
  #Above line cause error update_attribute in heroku shown in logs and it was proposed to fixed in github:'kul1/g241502'
24
24
  # Main action run with :id
25
25
  redirect_to :action=>'run', :id=>xmain.id
26
+
26
27
  else
27
28
  refresh_to "/", :alert => "Error: cannot process"
28
29
  error_run_xmain = "Error_run_xmain"
data/lib/generators/jinda/templates/app/controllers/jinda_org/notes_controller.rb CHANGED
@@ -3,7 +3,8 @@ class NotesController < ApplicationController
3
3
  # before_action :xload_current_ma_user, only: [:destroy]
4
4
 
5
5
  def index
6
- @notes = Note.desc(:created_at).page(params[:page]).per(10)
6
+ # @notes = Note.desc(:created_at).page(params[:page]).per(10)
7
+ @notes = Note
7
8
  end
8
9
 
9
10
  def my
data/lib/generators/jinda/templates/app/jinda/index.mm CHANGED
@@ -87,11 +87,11 @@
87
87
  </node>
88
88
  </node>
89
89
  </node>
90
- <node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
90
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_554831343" MODIFIED="1591392794806" TEXT="notes: Notes">
91
91
  <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
92
92
  <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
93
93
  </node>
94
- <node CREATED="1493419257021" FOLDED="true" ID="ID_553734932" MODIFIED="1589772585873" TEXT="new: New Note">
94
+ <node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1591278856955" TEXT="new: New Note">
95
95
  <node CREATED="1493419299004" ID="ID_723334321" MODIFIED="1581351169990" TEXT="new_note: New ">
96
96
  <icon BUILTIN="attach"/>
97
97
  <node CREATED="1493479075294" ID="ID_1009521360" MODIFIED="1493479079687" TEXT="role:m"/>
@@ -99,8 +99,13 @@
99
99
  <node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
100
100
  <icon BUILTIN="bookmark"/>
101
101
  </node>
102
+ <node CREATED="1591278861459" ID="ID_985992723" MODIFIED="1591319329198" TEXT="/notes/my">
103
+ <arrowlink DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" STARTARROW="None" STARTINCLINATION="0;0;"/>
104
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" SOURCE="ID_985992723" STARTARROW="None" STARTINCLINATION="0;0;"/>
105
+ <icon BUILTIN="forward"/>
102
106
  </node>
103
- <node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
107
+ </node>
108
+ <node CREATED="1493419562726" FOLDED="true" ID="ID_1241171950" MODIFIED="1591278847249" TEXT="edit: Edit">
104
109
  <node CREATED="1493419577933" ID="ID_1790163920" MODIFIED="1581350888992" TEXT="select_note: Select">
105
110
  <icon BUILTIN="attach"/>
106
111
  <node CREATED="1493479602815" ID="ID_1289003986" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -113,7 +118,7 @@
113
118
  <icon BUILTIN="bookmark"/>
114
119
  </node>
115
120
  </node>
116
- <node CREATED="1495246388313" ID="ID_320521408" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
121
+ <node CREATED="1495246388313" FOLDED="true" ID="ID_320521408" MODIFIED="1591278851391" STYLE="fork" TEXT="delete:Delete">
117
122
  <edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
118
123
  <node CREATED="1493419577933" ID="ID_1631275659" MODIFIED="1581350942681" TEXT="select_note: Select">
119
124
  <icon BUILTIN="attach"/>
@@ -123,7 +128,7 @@
123
128
  <icon BUILTIN="bookmark"/>
124
129
  </node>
125
130
  </node>
126
- <node CREATED="1581531446494" ID="ID_1325232876" MODIFIED="1581715693485" TEXT="mail: Mail">
131
+ <node CREATED="1581531446494" FOLDED="true" ID="ID_1325232876" MODIFIED="1591278853597" TEXT="mail: Mail">
127
132
  <node CREATED="1493419577933" FOLDED="true" ID="ID_1817148049" MODIFIED="1581531563343" TEXT="select_note: Select">
128
133
  <icon BUILTIN="attach"/>
129
134
  <node CREATED="1493479602815" ID="ID_1650154281" MODIFIED="1493479606921" TEXT="role:m"/>
@@ -146,16 +151,12 @@
146
151
  </node>
147
152
  </node>
148
153
  </node>
149
- <node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1589327646872" TEXT="articles: Article">
154
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_328863650" MODIFIED="1591392789585" TEXT="articles: Article">
150
155
  <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
151
156
  <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
152
157
  <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
153
158
  </node>
154
159
  <node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1588619429446" TEXT="new_article: New Article">
155
- <node CREATED="1588958814863" ID="ID_576640224" MODIFIED="1589053904119" TEXT="display: DisplayFile">
156
- <icon BUILTIN="idea"/>
157
- <node CREATED="1588959451085" ID="ID_779920893" MODIFIED="1588959473698" TEXT="display: Option"/>
158
- </node>
159
160
  <node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
160
161
  <icon BUILTIN="attach"/>
161
162
  <node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
@@ -163,6 +164,11 @@
163
164
  <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
164
165
  <icon BUILTIN="bookmark"/>
165
166
  </node>
167
+ <node CREATED="1591278861459" ID="ID_657878492" MODIFIED="1591319807025" TEXT="/articles/my">
168
+ <arrowlink DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" STARTARROW="None" STARTINCLINATION="0;0;"/>
169
+ <linktarget COLOR="#b0b0b0" DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" SOURCE="ID_657878492" STARTARROW="None" STARTINCLINATION="0;0;"/>
170
+ <icon BUILTIN="forward"/>
171
+ </node>
166
172
  </node>
167
173
  <node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1590180584955" TEXT="edit_article: Edit Article">
168
174
  <node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
@@ -188,8 +194,10 @@
188
194
  </node>
189
195
  </node>
190
196
  </node>
191
- <node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1583091848193" TEXT="comments: Comment">
192
- <node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1493665186791" TEXT="new_comment: New Comment">
197
+ <node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1591392798294" TEXT="comments: Comment">
198
+ <icon BUILTIN="button_cancel"/>
199
+ <node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
200
+ <icon BUILTIN="button_cancel"/>
193
201
  <node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
194
202
  <icon BUILTIN="bookmark"/>
195
203
  <node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
@@ -223,7 +231,7 @@
223
231
  <node CREATED="1494172758253" ID="ID_961056168" MODIFIED="1494172797972" TEXT="sitemap: Sitemap"/>
224
232
  <node CREATED="1494393494180" ID="ID_242460166" MODIFIED="1494393504971" TEXT="role:a"/>
225
233
  </node>
226
- <node CREATED="1493393619430" ID="ID_35210833" MODIFIED="1585089057213" TEXT="api/v1/notes: Notes API ">
234
+ <node CREATED="1493393619430" FOLDED="true" ID="ID_35210833" MODIFIED="1591392800862" TEXT="api/v1/notes: Notes API ">
227
235
  <node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1591074318558" TEXT="link:My Notes: /api/v1/notes/my">
228
236
  <icon BUILTIN="button_cancel"/>
229
237
  <node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
@@ -263,7 +271,7 @@
263
271
  <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
264
272
  <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
265
273
  </node>
266
- <node CREATED="1273819456867" ID="ID_1677010054" MODIFIED="1493418874718" POSITION="left" TEXT="models">
274
+ <node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
267
275
  <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
268
276
  <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
269
277
  <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>
data/lib/generators/jinda/templates/app/views/articles/new_article/form_article.html.erb CHANGED
@@ -2,6 +2,7 @@
2
2
  <%
3
3
  article = @article
4
4
  %>
5
+ <div id="article-table">
5
6
  <%= fields_for article do |f| %>
6
7
  <%= f.label :title, "Title" %>
7
8
  <%= f.text_field :title %>
@@ -12,3 +13,4 @@
12
13
  <%= f.label :body, "Body Content" %>
13
14
  <%= f.text_area :body %>
14
15
  <% end %>
16
+ </div>
data/lib/generators/jinda/templates/app/views/jinda/index.html.haml CHANGED
@@ -21,7 +21,7 @@
21
21
 
22
22
  %h2 Installation
23
23
  %ul
24
- %li add gem 'jinda', '0.5.4'
24
+ %li add gem 'jinda', '0.5.5'
25
25
  %li bundle
26
26
  %li rails generate jinda:install
27
27
  %li (run all with "sh install.sh" )
data/lib/jinda/helpers.rb CHANGED
@@ -199,6 +199,7 @@ module Jinda
199
199
  def redirect_to_root
200
200
  redirect_to root_path
201
201
  end
202
+
202
203
  # Todo refactor code
203
204
  def get_option(opt, runseq=@runseq)
204
205
  xml= REXML::Document.new(runseq.xml).root
@@ -840,7 +841,8 @@ module Jinda
840
841
  when 'help' # Question
841
842
  'if'
842
843
  when 'forward' # Forward
843
- 'redirect'
844
+ # 'redirect'
845
+ 'direct_to'
844
846
  when 'kaddressbook' #Phone
845
847
  'invoke' # invoke new service along the way
846
848
  when 'idea' # output
data/lib/jinda/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jinda
2
- VERSION = "0.5.4"
2
+ VERSION = "0.5.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jinda
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4
4
+ version: 0.5.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Prateep Kul
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2020-06-02 00:00:00.000000000 Z
12
+ date: 2020-06-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler