jinda 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6412f7c9df60f94abda676a7ebfe87dcdc0249a3c90947a3917c5a6c79c987c0
-  data.tar.gz: fee6c6c8aadf5d23b8baf804fc5c7424d0d1e0c443c2bade395b2d67320c39d5
+  metadata.gz: 34a83590140593e5245b54ea6edbfadc73dd4adaea05877d9743b64f06cd36e5
+  data.tar.gz: 644da69d744877a19d598a49ef21bb14bc8895cd17cd80122f5f2b9d03691519
 SHA512:
-  metadata.gz: c43442994c7a7567b0ace50547feed51e77a83238df4653d203a45ef825c19ff66cc4b9d1bdb0d9b1ff3f4e4a7cf864ee2ac736ac459029b1d437c2a57c4e908
-  data.tar.gz: efce113507fff946c4d924c857b2dde89fee4a1e79b9515881842f19360b92642c10db5be702950ae4ad7bb0f2007d9c1e6b40c399e908a360382236d5763174
+  metadata.gz: ae032fad6e397859dc90b213ddb8dd9a26facfc4d9dd547370b7ed69ed53f393c4a79a21d6e562b014e842f680dcea0c7188271caee124dbcb0aa4f27fba2b02
+  data.tar.gz: 155e54f906475400106f8761596a7b8a7c63c7b27d46f9697fd4474306b2d5c1e5fdf5365040127d990114f20ce9166dc9d7c8644cc9d53b299ea21bd042da0e

data/README.md

@@ -16,7 +16,7 @@ Rails Application Generator using Freemind
 These versions works for sure but others may do.
 
 * Ruby 2.5.0
-* Rails 5.2.1
+* Rails 5.2.3
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.3.3'
+    gem 'jinda', '~> 0.3.4'
 
 For Development (most updated)
 

data/lib/generators/jinda/config_generator.rb

@@ -9,7 +9,6 @@ module Jinda
         st="      "
         inside("config/initializers") {(File.file? "omniauth.rb") ? (run "mv omniauth.rb omniauth.rb.bak") : (puts "new omniauth.rb created")}
         inside("config/initializers") {(File.file? "mongoid.rb") ? (run "mv mongoid.rb omniauth.rb.bak") : (puts "new mongoid.rb created")}
-        inside("config/initializers") {(File.file? "ckeditor.rb") ? (run "mv ckeditor.rb ckeditor.rb.bak") : (puts "new ckeditor.rb created")}
 				(File.file? ".env") ? (run "cp .env .env-bak") : (puts "backup .env")
       end
 

data/lib/generators/jinda/install_generator.rb

@@ -12,6 +12,7 @@ module Jinda
         gem 'normalize-rails'
         gem 'font-awesome-sass', '~> 4.7.0'
         gem 'ckeditor', github: 'galetahub/ckeditor'
+
         gem 'mongoid-paperclip', require: 'mongoid_paperclip'
         gem 'meta-tags'
         gem 'jquery-turbolinks'
@@ -27,7 +28,7 @@ module Jinda
         gem 'bcrypt'
         gem 'omniauth-identity'
         gem 'omniauth-facebook'
-				gem 'omniauth-google-oauth2'
+	    gem 'omniauth-google-oauth2'
         gem 'dotenv-rails'
         gem 'cloudinary'
         gem 'kaminari'
@@ -40,14 +41,15 @@ module Jinda
           gem 'binding_of_caller'
           gem 'pry-byebug'
           gem 'factory_bot_rails'
-					gem 'database_cleaner'
+		  gem 'database_cleaner'
           gem 'guard'
           gem 'guard-rspec'
           gem 'guard-minitest'
           gem 'capybara'
-					gem 'selenium-webdriver'
+		  gem 'selenium-webdriver'
           gem 'rb-fsevent'
-					gem 'valid_attribute'
+		  gem 'valid_attribute'
+          gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master'
         end
       end
 
@@ -73,21 +75,21 @@ module Jinda
         route "resources :identities"
         route "resources :users"
         route "resources :articles"
-				route "get '/articles/my/destroy' => 'articles#destroy'"
+		route "get '/articles/my/destroy' => 'articles#destroy'"
         route "get '/articles/my' => 'articles/my'"
         route "get '/logout' => 'sessions#destroy', :as => 'logout'"
         route "get '/auth/:provider/callback' => 'sessions#create'"
         route "post '/auth/:provider/callback' => 'sessions#create'"        
+		route "\# end jinda method routes"
         route "mount Ckeditor::Engine => '/ckeditor'"
-				route "\# end jinda method routes"
         route "post '/jinda/end_form' => 'jinda#end_form'"
         route "post '/jinda/pending' => 'jinda#index'"
         route "post '/jinda/init' => 'jinda#init'"
         route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
-        route "jinda_methods += ['init','run','run_do','run_form','end_form','error_logs']"
+        route "jinda_methods += ['init','run','run_do','run_form','end_form','error_logs', 'notice_logs', 'cancel']"
         route "jinda_methods = ['pending','status','search','doc','logs','ajax_notice']"  
         route "\# start jiinda method routes"
-			end
+	  end
 
       def setup_env
         run "mv README.md README.md.bak"
@@ -105,6 +107,10 @@ module Jinda
     g.test_framework  :rspec
     g.integration_tool :rspec
   end
+
+  # config time zone
+  config.time_zone = "Central Time (US & Canada)"
+
   # gmail config
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {

data/lib/generators/jinda/templates/app/assets/javascripts/application.js

@@ -20,6 +20,5 @@
 //= require jqm/jinda
 //  require turbolinks
 //= require jqm/disable_enter_key.js
-//= require ckeditor/init
 
 

data/lib/generators/jinda/templates/app/controllers/admins_controller.rb

@@ -1,6 +1,6 @@
 class AdminsController < ApplicationController
   def update_role
-    user = User.find_by :code=> $xvars["select_user"]["code"]
+    user = Jinda::User.find_by :code=> $xvars["select_user"]["code"]
     user.update_attribute :role, $xvars["edit_role"]["role"]
   end
 end

data/lib/generators/jinda/templates/app/controllers/jinda_controller.rb

@@ -8,6 +8,9 @@ class JindaController < ApplicationController
   def error_logs
     @xmains = Jinda::Xmain.in(status:['E']).desc(:created_at).page(params[:page]).per(10)
   end
+  def notice_logs
+    @notices= Jinda::Notice.desc(:created_at).page(params[:page]).per(10)
+  end
   def pending
     @title= "Pending Tasks"
     @xmains = Jinda::Xmain.in(status:['R','I']).asc(:created_at)
@@ -42,7 +45,7 @@ class JindaController < ApplicationController
     module_code, code = params[:s].split(":")
     @service= Jinda::Service.where(:module_code=> module_code, :code=> code).first
     # @service= Jinda::Service.where(:module_code=> params[:module], :code=> params[:service]).first
-		if @service && authorize_init?
+    if @service && authorize_init?
       xmain = create_xmain(@service)
       result = create_runseq(xmain)
       unless result
@@ -61,8 +64,8 @@ class JindaController < ApplicationController
   end
   ####################################################################################################]
   # run if, form, mail, output etc depend on icon in freemind
-	# action from @runseq.action == do,     form,			if,     output
-	# Then will call				def run_do, run_form, run_if, run_output
+  # action from @runseq.action == do,     form,			if,     output
+  # Then will call				def run_do, run_form, run_if, run_output
   ####################################################################################################]
   def run
     init_vars(params[:id])
@@ -80,19 +83,22 @@ class JindaController < ApplicationController
         redirect_to_root
       else
         service= @xmain.service
-				###############################################################################################
-				# Run View Form f created template by jinda rake follow freemind mm file
-				###############################################################################################
+        ###############################################################################################
+        # Run View Form f created template by jinda rake follow freemind mm file
+        ###############################################################################################
         if service
           @title= "Transaction ID #{@xmain.xid}: #{@xmain.name} / #{@runseq.name}"
           fhelp= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.md"
           @help = File.read(fhelp) if File.exists?(fhelp)
           f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
-          @ui= File.read(f)
-        else
+          if File.file?(f)
+            @ui= File.read(f)
+          else
           # flash[:notice]= "Error: Can not find the view file for this controller"
           ma_log "Error: Can not find the view file for this controller"
           redirect_to_root
+          end
+
         end
       end
     else
@@ -169,15 +175,15 @@ class JindaController < ApplicationController
       if Jinda::Doc.where(:runseq_id=>@runseq.id).exists?
         @doc= Jinda::Doc.where(:runseq_id=>@runseq.id).first
         @doc.update_attributes :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
-                               :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
-                               :ip=> get_ip, :service=>service, :ma_display=>ma_display,
-                               :ma_secured => @xmain.service.ma_secured
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured
       else
         @doc= Jinda::Doc.create :name=> @runseq.name,
-                                  :content_type=>"output", :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
-                                  :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
-                                  :ip=> get_ip, :service=>service, :ma_display=>ma_display,
-                                  :ma_secured => @xmain.service.ma_secured
+          :content_type=>"output", :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured
       end
       @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next &gt;"
       @message = "Finish" if @runseq.end
@@ -198,10 +204,10 @@ class JindaController < ApplicationController
     f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
     @ui= File.read(f).html_safe
     @doc= Jinda::Doc.create :name=> @runseq.name,
-                              :content_type=>"mail", :data_text=> render_to_string(:inline=>@ui, :layout=>false),
-                              :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
-                              :ip=> get_ip, :service=>service, :ma_display=>false,
-                              :ma_secured => @xmain.service.ma_secured
+      :content_type=>"mail", :data_text=> render_to_string(:inline=>@ui, :layout=>false),
+      :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+      :ip=> get_ip, :service=>service, :ma_display=>false,
+      :ma_secured => @xmain.service.ma_secured
     eval "@xvars[:#{@runseq.code}] = url_for(:controller=>'jinda', :action=>'document', :id=>@doc.id)"
     mail_from = get_option('from')
     # sender= render_to_string(:inline=>mail_from) if mail_from
@@ -247,24 +253,24 @@ class JindaController < ApplicationController
   def end_form
     init_vars(params[:xmain_id])
     eval "@xvars[@runseq.code] = {} unless @xvars[@runseq.code]"
-		# Search for uploaded file name if exist
+    # Search for uploaded file name if exist
     params.each { |k,v|
       if params[k].respond_to? :original_filename
         get_image(k, params[k])
-			# check if params of array in form eg: edit_article	
+        # check if params of array in form eg: edit_article	
       elsif params[k].is_a?(ActionController::Parameters)
         params[k].each { |k1,v1|
-					# eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
-					eval "@xvars[@runseq.code][k1] = v1" 
-					next unless v1.respond_to?(:original_filename)
+          # eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
+          eval "@xvars[@runseq.code][k1] = v1" 
+          next unless v1.respond_to?(:original_filename)
           get_image1(k, k1, params[k][k1])
         }
       else
-				# bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
-				# Solution:
-				# https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
-				# v = v.to_unsafe_h unless v.class == String
-				# v = params.require[k] unless v.class == String
+        # bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
+        # Solution:
+        # https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
+        # v = v.to_unsafe_h unless v.class == String
+        # v = params.require[k] unless v.class == String
         v = v.to_s unless v.class == String
         eval "@xvars[@runseq.code][k] = v"
       end
@@ -304,14 +310,14 @@ class JindaController < ApplicationController
   # process images from first level
   def get_image(key, params)
     doc = Jinda::Doc.create(
-        :name=> key.to_s,
-        :xmain=> @xmain.id,
-        :runseq=> @runseq.id,
-        :filename=> params.original_filename,
-        :content_type => params.content_type || 'application/zip',
-        :data_text=> '',
-        :ma_display=>true,
-        :ma_secured => @xmain.service.ma_secured )
+      :name=> key.to_s,
+      :xmain=> @xmain.id,
+      :runseq=> @runseq.id,
+      :filename=> params.original_filename,
+      :content_type => params.content_type || 'application/zip',
+      :data_text=> '',
+      :ma_display=>true,
+      :ma_secured => @xmain.service.ma_secured )
     if defined?(IMAGE_LOCATION)
       filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
       File.open(filename,"wb") { |f| f.write(params.read) }
@@ -327,13 +333,13 @@ class JindaController < ApplicationController
   # process images from second level, e.g,, fields_for
   def get_image1(key, key1, params)
     doc = Jinda::Doc.create(
-        :name=> "#{key}_#{key1}",
-        :xmain=> @xmain.id,
-        :runseq=> @runseq.id,
-        :filename=> params.original_filename,
-        :content_type => params.content_type || 'application/zip',
-        :data_text=> '',
-        :ma_display=>true, :ma_secured => @xmain.service.ma_secured )
+      :name=> "#{key}_#{key1}",
+      :xmain=> @xmain.id,
+      :runseq=> @runseq.id,
+      :filename=> params.original_filename,
+      :content_type => params.content_type || 'application/zip',
+      :data_text=> '',
+      :ma_display=>true, :ma_secured => @xmain.service.ma_secured )
     if defined?(IMAGE_LOCATION)
       filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
       File.open(filename,"wb") { |f| f.write(params.read) }
@@ -365,15 +371,15 @@ class JindaController < ApplicationController
         #   h = RDoc::Markup::ToHtml.new
         #   render :text=> h.convert(doc), :layout => 'layouts/_page'
       }
-      format.pdf  {
-        latex= Maruku.new(doc).to_latex
-        File.open('tmp/doc.md','w') {|f| f.puts doc}
-        File.open('tmp/doc.tex','w') {|f| f.puts latex}
-        # system('pdflatex tmp/doc.tex ')
-        # send_file( 'tmp/doc.pdf', :type => ‘application/pdf’,
-        # :disposition => ‘inline’, :filename => 'doc.pdf')
-        render :plain=>'done'
-      }
+        format.pdf  {
+          latex= Maruku.new(doc).to_latex
+          File.open('tmp/doc.md','w') {|f| f.puts doc}
+          File.open('tmp/doc.tex','w') {|f| f.puts latex}
+          # system('pdflatex tmp/doc.tex ')
+          # send_file( 'tmp/doc.pdf', :type => ‘application/pdf’,
+          # :disposition => ‘inline’, :filename => 'doc.pdf')
+          render :plain=>'done'
+        }
     end
   end
   # handle uploaded image
@@ -397,7 +403,7 @@ class JindaController < ApplicationController
     @xvars= @xmain.xvars
     # flash.now[:notice]= "รายการ #{@xmain.id} ได้ถูกยกเลิกแล้ว" if @xmain.status=='X'
     ma_log "Task #{@xmain.id} is cancelled" if @xmain.status=='X'
-      # flash.now[:notice]= "transaction #{@xmain.id} was cancelled" if @xmain.status=='X'
+    # flash.now[:notice]= "transaction #{@xmain.id} was cancelled" if @xmain.status=='X'
   rescue
     refresh_to "/", :alert => "Could not find task number <b> #{params[:xid]} </b>"
   end
@@ -434,20 +440,20 @@ class JindaController < ApplicationController
     custom_controller= "#{c}Controller"
     params["return"] = request.env['HTTP_REFERER']
     Jinda::Xmain.create :service=>service,
-                          :start=>Time.now,
-                          :name=>service.name,
-                          :ip=> get_ip,
-                          :status=>'I', # init
-                          :user=>current_ma_user,
-                          :xvars=> {
-                              :service_id=>service.id,
-                              :p=>params.to_unsafe_h,
-                              :id=>params[:id],
-                              :user_id=>current_ma_user.try(:id),
-                              :custom_controller=>custom_controller,
-                              :host=>request.host,
-                              :referer=>request.env['HTTP_REFERER']
-                          }
+      :start=>Time.now,
+      :name=>service.name,
+      :ip=> get_ip,
+      :status=>'I', # init
+      :user=>current_ma_user,
+      :xvars=> {
+        :service_id=>service.id,
+        :p=>params.to_unsafe_h,
+        :id=>params[:id],
+        :user_id=>current_ma_user.try(:id),
+        :custom_controller=>custom_controller,
+        :host=>request.host,
+        :referer=>request.env['HTTP_REFERER']
+      }
   end
   def create_runseq(xmain)
     @xvars= xmain.xvars
@@ -484,10 +490,10 @@ class JindaController < ApplicationController
       role= get_option_xml("role", activity) || default_role
       rule= get_option_xml("rule", activity) || "true"
       runseq= Jinda::Runseq.create :xmain=>xmain.id,
-                                     :name=> name, :action=> action,
-                                     :code=> code, :role=>role.upcase, :rule=> rule,
-                                     :rstep=> i, :form_step=> j, :status=>'I',
-                                     :xml=>activity.to_s
+        :name=> name, :action=> action,
+        :code=> code, :role=>role.upcase, :rule=> rule,
+        :rstep=> i, :form_step=> j, :status=>'I',
+        :xml=>activity.to_s
       xmain.current_runseq= runseq.id if i==1
     end
     @xvars['total_steps']= i
@@ -497,7 +503,7 @@ class JindaController < ApplicationController
     @xmain= Jinda::Xmain.find xmain
     @xvars= @xmain.xvars
     @runseq= @xmain.runseqs.find @xmain.current_runseq
-#    authorize?
+    #    authorize?
     @xvars['current_step']= @runseq.rstep
     @xvars['referrer']= request.referrer
     session[:xmain_id]= @xmain.id
@@ -523,10 +529,10 @@ class JindaController < ApplicationController
   def store_asset
     if params[:content]
       doc = GmaDoc.create! :name=> 'asset',
-                           :filename=> (params[:file_name]||''),
-                           :content_type => (params[:content_type] || 'application/zip'),
-                           :data_text=> '',
-                           :ma_display=>true
+        :filename=> (params[:file_name]||''),
+        :content_type => (params[:content_type] || 'application/zip'),
+        :data_text=> '',
+        :ma_display=>true
       path = (IMAGE_LOCATION || "tmp")
       File.open("#{path}/f#{doc.id}","wb") { |f|
         f.puts(params[:content])

data/lib/generators/jinda/templates/app/controllers/password_resets.rb

@@ -2,7 +2,7 @@ class PasswordResetsController < ApplicationController
 
   def create
     ##user = User.find_by_email(params[:email])
-    user = User.where(:email => params[:email]).first
+    user = Jinda::User.where(:email => params[:email]).first
 
     user.send_password_reset if user
     redirect_to root_url, :notice => "Email sent with password reset instructions."
@@ -10,12 +10,12 @@ class PasswordResetsController < ApplicationController
 
   def edit
     ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    @user = Jinda::User.where(:password_reset_token => params[:id]).first
   end
 
   def update
     ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    @user = Jinda::User.where(:password_reset_token => params[:id]).first
     if @user.password_reset_sent_at < 2.hours.ago
       redirect_to new_password_reset_path, :alert => "Password reset has expired."
     elsif @user.update_attributes(params[:user])

data/lib/generators/jinda/templates/app/controllers/password_resets_controller.rb

@@ -5,7 +5,7 @@ class PasswordResetsController < ApplicationController
 
   def create
     #user = User.find_by_email(params[:email])
-    user = User.where(:email => params[:email]).first
+    user = Jinda::User.where(:email => params[:email]).first
 
     user.send_password_reset if user
     redirect_to root_url, :ma_notice => "Email sent with password reset instructions."
@@ -14,12 +14,12 @@ class PasswordResetsController < ApplicationController
   def edit
     ## Deprecated syntax in rail 5
     ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    @user = Jinda::User.where(:password_reset_token => params[:id]).first
   end
 
   def update
     ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    @user = Jinda::User.where(:password_reset_token => params[:id]).first
     if @user.password_reset_sent_at < 2.hours.ago
       redirect_to new_password_reset_path, :alert => "Password &crarr;
       reset has expired."

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

@@ -11,7 +11,7 @@ class Jinda::Doc
   field :cloudinary, :type => Boolean
   belongs_to :xmain, :class_name => "Jinda::Xmain"
   belongs_to :runseq, :class_name => "Jinda::Runseq"
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
   belongs_to :service, :class_name => "Jinda::Service"
   field :ip, :type => String
   field :ma_display, :type => Boolean

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

@@ -5,7 +5,7 @@ class Jinda::Notice
   field :message, :type => String
   field :unread, :type => Boolean
   field :ip, :type => String
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
 
   def self.recent(user_id, ip)
     where(unread: true, ip: ip).last

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

@@ -4,5 +4,5 @@ class Jinda::Role
   include Mongoid::Timestamps
   field :code, :type => String
   field :name, :type => String
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
 end

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

@@ -2,7 +2,7 @@
 class Jinda::Runseq
   include Mongoid::Document
   include Mongoid::Timestamps
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
   belongs_to :xmain, :class_name => "Jinda::Xmain"
 
   field :action, :type => String

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

@@ -14,14 +14,14 @@
   %h2 Recently tested with:
   %ul  
     %li Rubygems 2.5.0
-    %li Rails 5.2.1
+    %li Rails 5.2.3
     %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record 
     %li (rails new YOURAPP -BOT)
 
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.3.3'
+    %li add gem 'jinda', '0.3.4'
     %li bundle
     %li rails generate jinda:install
     %li bundle

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

@@ -0,0 +1,18 @@
+- @title= "Notice Error Logs"
+= paginate @notices
+%table{:id=>"pending-table", :width=>"100%"}
+  %tr{:style=>"color:white; background-color:#97BF60;"}
+    %th created
+    %th user
+    %th message
+  - @notices.each do |notice|
+    - @notice= notice
+    - current_notice = @notice.id
+    - #current_notice_user = @notice.user
+    - notice_user = (Jinda::User.find @notice.user ? notice.user : 0)
+    - (notice_user_name = notice_user.code) if notice_user
+
+    %tr
+      %td(style='vertical-align:top;')= notice.created_at
+      %td(style='vertical-align:top;')= notice_user_name
+      %td(style='vertical-align:top;')= notice.message 

data/lib/jinda/helpers.rb

@@ -102,12 +102,14 @@ module Jinda
         $user_image = current_ma_user.image
         $user_name = current_ma_user.code
         $user_email = current_ma_user.email
+        $user_id = current_ma_user.try(:id)
       else
         $user_image = asset_url("user.png", :width => "48")
         $user_name = 'Guest User'
         $user_email = 'guest@sample.com'
+        $user_id = ''
       end
-      return $user_image, $user_name, $user_email
+      return $user_image, $user_name, $user_email,$user_id
     end
 
     def name2code(s)
@@ -159,15 +161,15 @@ module Jinda
       end
     end
     def ma_log(message)
-        Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-          :unread=> true, :ip=> ($ip || request.env["REMOTE_ADDR"])
-      # if session[:user_id]
-      #   Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-      #     :user_id => $user.id, :unread=> true, :ip=>request.env["REMOTE_ADDR"]
-      # else
-      #   Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-      #     :unread=> true, :ip=>request.env["REMOTE_ADDR"]
-      # end
+      #  Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+      #    :unread=> true, :ip=> ($ip || request.env["REMOTE_ADDR"])
+       if session[:user_id]
+         Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+           :user_id => $user.id, :unread=> true, :ip=>request.env["REMOTE_ADDR"]
+       else
+         Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+           :unread=> true, :ip=>request.env["REMOTE_ADDR"]
+       end
     end
 
     alias :ma_notice :ma_log

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.3.3"
+	VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -378,6 +378,7 @@ files:
 - lib/generators/jinda/templates/app/views/jinda/help.haml
 - lib/generators/jinda/templates/app/views/jinda/index.html.haml
 - lib/generators/jinda/templates/app/views/jinda/logs.haml
+- lib/generators/jinda/templates/app/views/jinda/notice_logs.haml
 - lib/generators/jinda/templates/app/views/jinda/pending.haml
 - lib/generators/jinda/templates/app/views/jinda/run_form.haml
 - lib/generators/jinda/templates/app/views/jinda/run_output.haml