jinda 0.7.7.4 → 1.0.0
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.
- checksums.yaml +4 -4
- data/README.md +46 -29
- data/Rakefile +103 -1
- data/app/assets/config/manifest.js +4 -1
- data/app/assets/javascripts/jinda_bootstrap.js +20 -0
- data/app/assets/stylesheets/_jinda_bootstrap_theme.scss +190 -0
- data/{lib/generators/jinda/templates/app/assets/stylesheets/jinda_jqm.css.scss → app/assets/stylesheets/jinda_bootstrap.css.scss} +12 -10
- data/app/config/routes.rb +38 -28
- data/app/controllers/concerns/jinda_general_concern.rb +86 -87
- data/app/controllers/concerns/jinda_run_concern.rb +184 -184
- data/app/controllers/jinda_controller.rb +23 -22
- data/bin/lint_modified +21 -0
- data/config/routes.rb +41 -22
- data/lib/generators/jinda/config_generator.rb +102 -81
- data/lib/generators/jinda/install_generator.rb +305 -148
- data/lib/generators/jinda/install_generator.rb.bak2 +268 -0
- data/lib/generators/jinda/installer/gems_install.rb +125 -127
- data/lib/generators/jinda/minitest_generator.rb +19 -18
- data/lib/generators/jinda/rspec_generator.rb +15 -14
- data/lib/generators/jinda/templates/DOCKER.md +188 -0
- data/lib/generators/jinda/templates/Dockerfile +15 -5
- data/lib/generators/jinda/templates/README.md +3 -3
- data/lib/generators/jinda/templates/app/assets/config/manifest.js +4 -0
- data/lib/generators/jinda/templates/app/assets/javascripts/application.js +8 -8
- data/lib/generators/jinda/templates/app/channels/application_cable/channel.rb +2 -0
- data/lib/generators/jinda/templates/app/channels/application_cable/connection.rb +2 -0
- data/{test/dummy → lib/generators/jinda/templates}/app/controllers/adminltes_controller.rb +1 -0
- data/lib/generators/jinda/templates/app/controllers/api/v1/notes_controller.rb +80 -78
- data/lib/generators/jinda/templates/app/controllers/jinda_org/admins_controller.rb +4 -2
- data/lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb +11 -9
- data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb +40 -44
- data/lib/generators/jinda/templates/app/controllers/jinda_org/comments_controller.rb +10 -8
- data/lib/generators/jinda/templates/app/controllers/jinda_org/docs_controller.rb +23 -24
- data/lib/generators/jinda/templates/app/controllers/jinda_org/identities_controller.rb +3 -1
- data/lib/generators/jinda/templates/app/controllers/jinda_org/notes_controller.rb +25 -27
- data/lib/generators/jinda/templates/app/controllers/jinda_org/password_resets_controller.rb +16 -18
- data/lib/generators/jinda/templates/app/controllers/jinda_org/sessions_controller.rb +13 -14
- data/lib/generators/jinda/templates/app/controllers/jinda_org/sitemap_controller.rb +4 -4
- data/lib/generators/jinda/templates/app/controllers/jinda_org/users_controller.rb +14 -14
- data/lib/generators/jinda/templates/app/controllers/mindmap_editor_controller.rb +74 -0
- data/lib/generators/jinda/templates/app/helpers/admins_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/application_helper.rb +21 -20
- data/lib/generators/jinda/templates/app/helpers/articles_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/basic_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/comments_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/ctrs_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/devs_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/mindmap_editor_helper.rb +3 -0
- data/lib/generators/jinda/templates/app/helpers/pictures_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/sitemap_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/helpers/users_helper.rb +2 -0
- data/lib/generators/jinda/templates/app/jinda/index.mm +276 -298
- data/lib/generators/jinda/templates/app/jinda/template/index.mm +1 -0
- data/lib/generators/jinda/templates/app/mailers/jinda_mailer.rb +5 -3
- data/lib/generators/jinda/templates/app/mailers/note_mailer.rb +6 -4
- data/lib/generators/jinda/templates/app/mailers/user_mailer.rb +5 -5
- data/lib/generators/jinda/templates/app/models/address.rb +10 -8
- data/lib/generators/jinda/templates/app/models/article.rb +8 -6
- data/lib/generators/jinda/templates/app/models/comment.rb +10 -8
- data/lib/generators/jinda/templates/app/models/identity.rb +11 -10
- data/lib/generators/jinda/templates/app/models/jinda/doc.rb +36 -33
- data/lib/generators/jinda/templates/app/models/jinda/jinda_module.rb +15 -0
- data/lib/generators/jinda/templates/app/models/jinda/module.rb +14 -10
- data/lib/generators/jinda/templates/app/models/jinda/notice.rb +15 -11
- data/lib/generators/jinda/templates/app/models/jinda/role.rb +11 -7
- data/lib/generators/jinda/templates/app/models/jinda/runseq.rb +23 -20
- data/lib/generators/jinda/templates/app/models/jinda/service.rb +19 -15
- data/lib/generators/jinda/templates/app/models/jinda/xmain.rb +42 -36
- data/lib/generators/jinda/templates/app/models/note.rb +14 -10
- data/lib/generators/jinda/templates/app/models/param.rb +23 -20
- data/lib/generators/jinda/templates/app/models/person.rb +9 -7
- data/lib/generators/jinda/templates/app/models/user.rb +42 -41
- data/lib/generators/jinda/templates/app/views/articles/show.html.haml +2 -2
- data/lib/generators/jinda/templates/app/views/identities/new.html.haml +13 -0
- data/lib/generators/jinda/templates/app/views/jinda/_static_bootstrap.haml +23 -0
- data/lib/generators/jinda/templates/app/views/jinda/feed.rss.builder +15 -13
- data/lib/generators/jinda/templates/app/views/jinda/index.html.haml +3 -2
- data/lib/generators/jinda/templates/app/views/layouts/application.haml +31 -4
- data/lib/generators/jinda/templates/app/views/layouts/lte/_header.haml +54 -0
- data/{test/dummy → lib/generators/jinda/templates}/app/views/layouts/lte/_sidebar.haml +1 -1
- data/lib/generators/jinda/templates/app/views/mindmap_editor/edit.html.haml +126 -0
- data/lib/generators/jinda/templates/app/views/mindmap_editor/save.html.haml +2 -0
- data/lib/generators/jinda/templates/app/views/sessions/new.html.haml +13 -0
- data/lib/generators/jinda/templates/bin/lint_modified +21 -0
- data/lib/generators/jinda/templates/config/mongoid.yml +3 -3
- data/lib/generators/jinda/templates/config/mongoid.yml-docker +3 -3
- data/lib/generators/jinda/templates/config/mongoid.yml-localhost +3 -3
- data/lib/generators/jinda/templates/docker-compose-mongodb.yml +13 -0
- data/lib/generators/jinda/templates/docker-compose-web.yml +36 -0
- data/lib/generators/jinda/templates/docker-compose.yml +10 -14
- data/lib/generators/jinda/templates/spec/controllers/api/v1_get_index_spec.rb +15 -14
- data/lib/generators/jinda/templates/spec/controllers/api/v1_get_my_spec.rb +9 -4
- data/lib/generators/jinda/templates/spec/controllers/api/v1_post_spec.rb +4 -3
- data/lib/generators/jinda/templates/spec/controllers/sessions_controller_spec.rb +82 -90
- data/lib/generators/jinda/templates/spec/features/userlogins_spec.rb +12 -15
- data/lib/generators/jinda/templates/spec/mailers/note_spec.rb +5 -8
- data/lib/generators/jinda/templates/spec/mailers/previews/note_preview.rb +3 -5
- data/lib/generators/jinda/templates/spec/models/note_spec.rb +36 -35
- data/lib/generators/jinda/templates/spec/models/user_spec.rb +10 -8
- data/lib/generators/jinda/templates/spec/rails_helper.rb +29 -31
- data/lib/generators/jinda/templates/spec/spec_helper.rb +19 -17
- data/lib/generators/jinda/templates/spec/support/authentication_helper.rb +8 -7
- data/lib/generators/jinda/templates/spec/support/databasecleaner.rb +3 -1
- data/lib/generators/jinda/templates/spec/support/factory_bot.rb +7 -5
- data/lib/generators/jinda/templates/spec/support/omniauth_macros.rb +14 -19
- data/lib/generators/jinda/templates/spec/support/request_spec_helper.rb +3 -1
- data/lib/generators/jinda/templates/spec/views/articles/_article.html.erb_spec.rbx +9 -8
- data/lib/generators/jinda/templates/test/application_system_test_case.rb +3 -1
- data/lib/generators/jinda/templates/test/integration/jinda_routes_test.rb +16 -21
- data/lib/generators/jinda/templates/test/test_helper.rb +7 -3
- data/lib/jinda/date_helpers.rb +50 -41
- data/lib/jinda/gem_helpers.rb +10 -8
- data/lib/jinda/gen_class.rb +14 -12
- data/lib/jinda/gen_controller.rb +9 -8
- data/lib/jinda/gen_freemind.rb +33 -32
- data/lib/jinda/gen_helpers.rb +146 -139
- data/lib/jinda/gen_models.rb +125 -131
- data/lib/jinda/gen_modules.rb +21 -16
- data/lib/jinda/gen_runseq.rb +71 -67
- data/lib/jinda/gen_services.rb +74 -80
- data/lib/jinda/gen_xmain.rb +38 -36
- data/lib/jinda/get_app.rb +31 -29
- data/lib/jinda/helpers.rb +4 -4
- data/lib/jinda/init_vars.rb +41 -36
- data/lib/jinda/mindmap_converter.rb +196 -0
- data/lib/jinda/railtie.rb +10 -2
- data/lib/jinda/rake_views.rb +61 -60
- data/lib/jinda/refresh.rb +67 -61
- data/lib/jinda/themes.rb +80 -60
- data/lib/jinda/version.rb +3 -1
- data/lib/jinda.rb +2 -0
- data/lib/tasks/jinda.rake +25 -22
- data/test/INTEGRATION_TEST_README.md +374 -0
- data/test/LOCAL_DEVELOPMENT.md +345 -0
- data/test/README.md +243 -0
- data/test/TEST_INFRASTRUCTURE.md +412 -0
- data/test/TEST_INSTALLATION_SH_FIXES.md +205 -0
- data/test/UNIT_TESTS_README.md +366 -0
- data/test/api_notes_controller_test.rb +231 -0
- data/test/dummy/DOCKER.md +188 -0
- data/test/dummy/Dockerfile +15 -7
- data/test/dummy/Gemfile +38 -29
- data/test/dummy/Gemfile.lock +671 -292
- data/test/dummy/app/assets/config/manifest.js +4 -0
- data/test/dummy/app/channels/application_cable/channel.rb +2 -0
- data/test/dummy/app/channels/application_cable/connection.rb +2 -0
- data/test/dummy/app/controllers/admins_controller.rb +4 -2
- data/test/dummy/app/controllers/api/v1/notes_controller.rb +80 -78
- data/test/dummy/app/controllers/application_controller.rb +11 -9
- data/test/dummy/app/controllers/articles_controller.rb +40 -44
- data/test/dummy/app/controllers/comments_controller.rb +10 -8
- data/test/dummy/app/controllers/ctrs_controller.rb +2 -0
- data/test/dummy/app/controllers/devs_controller.rb +2 -0
- data/test/dummy/app/controllers/docs_controller.rb +23 -24
- data/test/dummy/app/controllers/identities_controller.rb +3 -1
- data/test/dummy/app/controllers/mindmap_editor_controller.rb +74 -0
- data/test/dummy/app/controllers/notes_controller.rb +25 -27
- data/test/dummy/app/controllers/password_resets_controller.rb +16 -18
- data/test/dummy/app/controllers/sessions_controller.rb +13 -14
- data/test/dummy/app/controllers/sitemap_controller.rb +4 -4
- data/test/dummy/app/controllers/users_controller.rb +14 -14
- data/test/dummy/app/helpers/admins_helper.rb +2 -0
- data/test/dummy/app/helpers/application_helper.rb +21 -20
- data/test/dummy/app/helpers/articles_helper.rb +2 -0
- data/test/dummy/app/helpers/basic_helper.rb +2 -0
- data/test/dummy/app/helpers/comments_helper.rb +2 -0
- data/test/dummy/app/helpers/ctrs_helper.rb +2 -0
- data/test/dummy/app/helpers/devs_helper.rb +2 -0
- data/test/dummy/app/helpers/mindmap_editor_helper.rb +3 -0
- data/test/dummy/app/helpers/pictures_helper.rb +2 -0
- data/test/dummy/app/helpers/sitemap_helper.rb +2 -0
- data/test/dummy/app/helpers/users_helper.rb +2 -0
- data/test/dummy/app/jinda/index.mm +384 -486
- data/test/dummy/app/jinda/template/index.mm +1 -0
- data/test/dummy/app/mailers/application_mailer.rb +2 -2
- data/test/dummy/app/mailers/application_mailer.rb-org +4 -0
- data/test/dummy/app/mailers/jinda_mailer.rb +5 -3
- data/test/dummy/app/mailers/note_mailer.rb +6 -4
- data/test/dummy/app/mailers/user_mailer.rb +5 -5
- data/test/dummy/app/models/address.rb +2 -0
- data/test/dummy/app/models/article.rb +2 -0
- data/test/dummy/app/models/comment.rb +3 -2
- data/test/dummy/app/models/identity.rb +11 -10
- data/test/dummy/app/models/jinda/doc.rb +36 -33
- data/test/dummy/app/models/jinda/jinda_module.rb +15 -0
- data/test/dummy/app/models/jinda/module.rb +14 -10
- data/test/dummy/app/models/jinda/notice.rb +15 -11
- data/test/dummy/app/models/jinda/role.rb +11 -7
- data/test/dummy/app/models/jinda/runseq.rb +23 -20
- data/test/dummy/app/models/jinda/service.rb +19 -15
- data/test/dummy/app/models/jinda/xmain.rb +42 -36
- data/test/dummy/app/models/note.rb +3 -8
- data/test/dummy/app/models/param.rb +23 -20
- data/test/dummy/app/models/person.rb +2 -0
- data/test/dummy/app/models/picture.rb +11 -0
- data/test/dummy/app/models/user.rb +42 -41
- data/test/dummy/app/views/admins/index.haml +21 -0
- data/test/dummy/app/views/api/v1/notes/delete/select_note.html.erb +21 -0
- data/test/dummy/app/views/api/v1/notes/edit/edit_note.html.erb +21 -0
- data/test/dummy/app/views/api/v1/notes/index.haml +21 -0
- data/test/dummy/app/views/api/v1/notes/new/new_note.html.erb +21 -0
- data/test/dummy/app/views/articles/show.html.haml +2 -2
- data/test/dummy/app/views/devs/index.haml +21 -0
- data/test/dummy/app/views/jinda/feed.rss.builder +15 -13
- data/test/dummy/app/views/jinda/index.html.haml +3 -2
- data/test/dummy/app/views/layouts/application.haml +2 -2
- data/test/dummy/app/views/mindmap_editor/edit.html.haml +126 -0
- data/test/dummy/app/views/mindmap_editor/save.html.haml +2 -0
- data/test/dummy/bin/docker-entrypoint +3 -0
- data/test/dummy/bin/lint_modified +21 -0
- data/test/dummy/bin/setup +1 -1
- data/test/dummy/config/application.rb +7 -2
- data/test/dummy/config/boot.rb +2 -1
- data/test/dummy/config/cable.yml +1 -1
- data/test/dummy/config/credentials.yml.enc +1 -1
- data/test/dummy/config/environments/development.rb +7 -1
- data/test/dummy/config/environments/production.rb +30 -26
- data/test/dummy/config/environments/test.rb +12 -8
- data/test/dummy/config/initializers/content_security_policy.rb +2 -2
- data/test/dummy/config/initializers/filter_parameter_logging.rb +3 -3
- data/test/dummy/config/initializers/mindmap_converter.rb +5 -0
- data/test/dummy/config/initializers/mongoid.rb +24 -9
- data/test/dummy/config/initializers/omniauth.rb +5 -0
- data/test/dummy/config/initializers/permissions_policy.rb +11 -9
- data/test/dummy/config/locales/en.yml +11 -13
- data/test/dummy/config/mongoid.yml +172 -53
- data/test/dummy/config/mongoid.yml-docker +3 -3
- data/test/dummy/config/mongoid.yml-localhost +3 -3
- data/test/dummy/config/puma.rb +21 -20
- data/test/dummy/config/routes.rb +7 -1
- data/test/dummy/docker-compose-mongodb.yml +13 -0
- data/test/dummy/docker-compose-web.yml +36 -0
- data/test/dummy/docker-compose.yml +10 -18
- data/test/dummy/log/development.log +5834 -2261
- data/test/dummy/spec/controllers/api/v1_get_index_spec.rb +15 -14
- data/test/dummy/spec/controllers/api/v1_get_my_spec.rb +9 -4
- data/test/dummy/spec/controllers/api/v1_post_spec.rb +4 -3
- data/test/dummy/spec/controllers/sessions_controller_spec.rb +82 -90
- data/test/dummy/spec/factories/pictures.rb +5 -0
- data/test/dummy/spec/features/userlogins_spec.rb +12 -15
- data/test/dummy/spec/mailers/note_spec.rb +5 -8
- data/test/dummy/spec/mailers/previews/note_preview.rb +3 -5
- data/test/dummy/spec/models/note_spec.rb +36 -35
- data/test/dummy/spec/models/picture_spec.rb +5 -0
- data/test/dummy/spec/models/user_spec.rb +10 -8
- data/test/dummy/spec/rails_helper.rb +29 -31
- data/test/dummy/spec/requests/ctrs_spec.rb +7 -0
- data/test/dummy/spec/requests/devs_spec.rb +7 -0
- data/test/dummy/spec/spec_helper.rb +19 -17
- data/test/dummy/spec/support/authentication_helper.rb +8 -7
- data/test/dummy/spec/support/databasecleaner.rb +3 -1
- data/test/dummy/spec/support/factory_bot.rb +7 -5
- data/test/dummy/spec/support/omniauth_macros.rb +14 -19
- data/test/dummy/spec/support/request_spec_helper.rb +3 -1
- data/test/dummy/spec/views/articles/_article.html.erb_spec.rbx +9 -8
- data/test/generated_app_test.rb +261 -0
- data/test/installation_test.rb +368 -0
- data/test/integration_test.rb +398 -0
- data/test/jenkins_stage_test.rb +182 -0
- data/test/note_model_test.rb +224 -0
- data/test/note_validation_integration_test.rb +292 -0
- data/test/run_unit_tests.sh +91 -0
- data/test/test_helper.rb +8 -16
- metadata +188 -60
- data/lib/generators/jinda/templates/app/assets/stylesheets/application.css.scss +0 -15
- data/lib/generators/jinda/templates/app/controllers/jinda_org/password_resets.rb +0 -28
- data/lib/generators/jinda/templates/app/views/layouts/_head.html.erb +0 -10
- data/lib/generators/jinda/templates/app/views/layouts/_meta_tag.html.erb +0 -19
- data/lib/generators/jinda/templates/app/views/layouts/bsb/_footer.haml +0 -7
- data/lib/generators/jinda/templates/app/views/layouts/bsb/_header.haml +0 -147
- data/lib/generators/jinda/templates/app/views/layouts/bsb/_menu.haml +0 -47
- data/lib/generators/jinda/templates/app/views/layouts/bsb/_menu_mm.haml +0 -34
- data/lib/generators/jinda/templates/app/views/layouts/bsb/_sidebar.haml +0 -155
- data/lib/generators/jinda/templates/app/views/layouts/bsb/application.haml-bsb +0 -47
- data/lib/generators/jinda/templates/app/views/layouts/gmail.html.erb +0 -9
- data/lib/generators/jinda/templates/app/views/layouts/jqm/_full.haml +0 -33
- data/lib/generators/jinda/templates/app/views/layouts/jqm/_page.haml +0 -16
- data/lib/generators/jinda/templates/app/views/layouts/jqm/application.haml-jqm +0 -4
- data/lib/generators/jinda/templates/app/views/layouts/mailer.html.erb +0 -13
- data/lib/generators/jinda/templates/app/views/layouts/mailer.html.haml +0 -3
- data/lib/generators/jinda/templates/app/views/layouts/mailer.text.erb +0 -1
- data/lib/generators/jinda/templates/app/views/layouts/mailer.text.haml +0 -1
- data/lib/generators/jinda/templates/app/views/layouts/mobile.html.erb +0 -13
- data/lib/generators/jinda/templates/app/views/layouts/mobilejq.html.erb +0 -31
- data/lib/generators/jinda/templates/app/views/layouts/print.html.erb +0 -22
- data/lib/generators/jinda/templates/app/views/layouts/utf8.html.erb +0 -22
- data/lib/generators/jinda/templates/config/initializers/fix_mongoid_generator.rb-org +0 -14
- data/test/dummy/Guardfile +0 -96
- data/test/dummy/app/controllers/application_controller.rb.bak +0 -2
- data/test/dummy/app/controllers/password_resets.rb +0 -28
- data/test/dummy/app/helpers/application_helper.rb.bak +0 -2
- data/test/dummy/app/views/identities/new-bak.html.haml +0 -32
- data/test/dummy/app/views/layouts/application.haml.bak +0 -4
- data/test/dummy/app/views/layouts/application.html.erb.bak +0 -15
- data/test/dummy/app/views/layouts/lte/_header.haml +0 -111
- data/test/dummy/app/views/layouts/lte/_rightbar.haml +0 -123
- data/test/dummy/app/views/sessions/new-bak.html.haml +0 -22
- data/test/dummy/config/initializers/fix_mongoid_generator.rb-org +0 -14
- data/test/dummy/tmp/development_secret.txt +0 -1
- data/test/integration/navigation_test.rb +0 -7
- data/test/jinda_test.rb +0 -7
- /data/{test/dummy → lib/generators/jinda/templates}/app/assets/stylesheets/application.scss +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/assets/stylesheets/jinda.scss +0 -0
- /data/lib/generators/jinda/templates/app/mailers/{application_mailer.rb → application_mailer.rb-org} +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/adminltes/dashboard1.haml +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/adminltes/dashboard2.haml +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/layouts/lte/_flash.haml +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/layouts/lte/_footer.haml +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/layouts/lte/_menu.haml +0 -0
- /data/{test/dummy → lib/generators/jinda/templates}/app/views/layouts/lte/_menu_mm.haml +0 -0
- /data/lib/generators/jinda/templates/app/views/layouts/{bsb → lte}/_rightbar.haml +0 -0
|
@@ -1,56 +1,54 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
module JindaGeneralConcern
|
|
2
4
|
extend ActiveSupport::Concern
|
|
3
5
|
|
|
4
|
-
def index
|
|
5
|
-
end
|
|
6
|
+
def index; end
|
|
6
7
|
|
|
7
8
|
def logs
|
|
8
9
|
@xmains = Jinda::Xmain.all.desc(:created_at).page(params[:page]).per(10)
|
|
9
10
|
end
|
|
10
11
|
|
|
11
12
|
def error_logs
|
|
12
|
-
@xmains = Jinda::Xmain.in(status:['E']).desc(:created_at).page(params[:page]).per(10)
|
|
13
|
+
@xmains = Jinda::Xmain.in(status: ['E']).desc(:created_at).page(params[:page]).per(10)
|
|
13
14
|
end
|
|
14
15
|
|
|
15
16
|
def notice_logs
|
|
16
|
-
@notices= Jinda::Notice.desc(:created_at).page(params[:page]).per(10)
|
|
17
|
+
@notices = Jinda::Notice.desc(:created_at).page(params[:page]).per(10)
|
|
17
18
|
end
|
|
18
19
|
|
|
19
20
|
def pending
|
|
20
|
-
@title=
|
|
21
|
-
@xmains = Jinda::Xmain.in(status:[
|
|
21
|
+
@title = 'Pending Tasks'
|
|
22
|
+
@xmains = Jinda::Xmain.in(status: %w[R I]).asc(:created_at)
|
|
22
23
|
end
|
|
23
24
|
|
|
24
25
|
def cancel
|
|
25
|
-
Jinda::Xmain.find(params[:id]).
|
|
26
|
-
|
|
27
|
-
redirect_to params[:return]
|
|
28
|
-
else
|
|
29
|
-
redirect_to action:"pending"
|
|
30
|
-
end
|
|
26
|
+
Jinda::Xmain.find(params[:id]).update status: 'X'
|
|
27
|
+
redirect_to params[:return] || { action: 'pending' }
|
|
31
28
|
end
|
|
32
29
|
|
|
33
30
|
# process images from first level
|
|
34
31
|
def get_image(key, params)
|
|
35
32
|
doc = Jinda::Doc.create(
|
|
36
|
-
:
|
|
37
|
-
:
|
|
38
|
-
:
|
|
39
|
-
:
|
|
40
|
-
:
|
|
41
|
-
:
|
|
42
|
-
:
|
|
43
|
-
:
|
|
33
|
+
name: key.to_s,
|
|
34
|
+
xmain: @xmain.id,
|
|
35
|
+
runseq: @runseq.id,
|
|
36
|
+
filename: params.original_filename,
|
|
37
|
+
content_type: params.content_type || 'application/zip',
|
|
38
|
+
data_text: '',
|
|
39
|
+
ma_display: true,
|
|
40
|
+
ma_secured: @xmain.service.ma_secured
|
|
41
|
+
)
|
|
44
42
|
if defined?(IMAGE_LOCATION)
|
|
45
43
|
filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
|
|
46
|
-
File.
|
|
44
|
+
File.binwrite(filename, params.read)
|
|
47
45
|
# File.open(filename,"wb") { |f| f.puts(params.read) }
|
|
48
|
-
eval "@xvars[@runseq.code][key] = '#{url_for(:
|
|
49
|
-
doc.
|
|
46
|
+
eval "@xvars[@runseq.code][key] = '#{url_for(action: 'document', id: doc.id, only_path: true)}' "
|
|
47
|
+
doc.update url: filename, basename: File.basename(filename), cloudinary: false
|
|
50
48
|
else
|
|
51
49
|
result = Cloudinary::Uploader.upload(params)
|
|
52
|
-
eval %
|
|
53
|
-
doc.
|
|
50
|
+
eval %( @xvars[@runseq.code][key] = '#{result['url']}' )
|
|
51
|
+
doc.update url: result['url'], basename: File.basename(result['url']), cloudinary: true
|
|
54
52
|
end
|
|
55
53
|
end
|
|
56
54
|
|
|
@@ -58,35 +56,37 @@ module JindaGeneralConcern
|
|
|
58
56
|
# save uploaded file info to Doc
|
|
59
57
|
def get_image1(key, key1, params)
|
|
60
58
|
doc = Jinda::Doc.create(
|
|
61
|
-
:
|
|
62
|
-
:
|
|
63
|
-
:
|
|
64
|
-
:
|
|
65
|
-
:
|
|
66
|
-
:
|
|
67
|
-
:
|
|
68
|
-
:
|
|
69
|
-
:
|
|
70
|
-
:
|
|
71
|
-
:
|
|
59
|
+
name: "#{key}_#{key1}",
|
|
60
|
+
xmain: @xmain.id,
|
|
61
|
+
runseq: @runseq.id,
|
|
62
|
+
filename: params.original_filename,
|
|
63
|
+
content_type: params.content_type || 'application/zip',
|
|
64
|
+
data_text: '',
|
|
65
|
+
dscan: '',
|
|
66
|
+
description: '',
|
|
67
|
+
keywords: '',
|
|
68
|
+
category: '',
|
|
69
|
+
ma_display: true, ma_secured: @xmain.service.ma_secured
|
|
70
|
+
)
|
|
72
71
|
if defined?(IMAGE_LOCATION)
|
|
73
72
|
filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
|
|
74
|
-
File.
|
|
75
|
-
eval "@xvars[@runseq.code][key][key1] = '#{url_for(:
|
|
76
|
-
doc.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
73
|
+
File.binwrite(filename, params.read)
|
|
74
|
+
eval "@xvars[@runseq.code][key][key1] = '#{url_for(action: 'document', id: doc.id, only_path: true)}' "
|
|
75
|
+
doc.update url: filename,
|
|
76
|
+
basename: File.basename(filename),
|
|
77
|
+
cloudinary: false,
|
|
78
|
+
dscan: @xvars[@runseq.code][key][key1],
|
|
79
|
+
user_id: @xvars['user_id']
|
|
81
80
|
else
|
|
82
81
|
result = Cloudinary::Uploader.upload(params)
|
|
83
|
-
eval %
|
|
84
|
-
doc.
|
|
82
|
+
eval %( @xvars[@runseq.code][key][key1] = '#{result['url']}' )
|
|
83
|
+
doc.update url: result['url'], basename: File.basename(result['url']), cloudinary: true,
|
|
84
|
+
dscan: @xvars[@runseq.code][key][key1]
|
|
85
85
|
end
|
|
86
86
|
end
|
|
87
87
|
|
|
88
88
|
def doc_print
|
|
89
|
-
render :
|
|
89
|
+
render file: 'public/doc.html', layout: 'layouts/print'
|
|
90
90
|
end
|
|
91
91
|
|
|
92
92
|
# generate documentation for application
|
|
@@ -95,85 +95,84 @@ module JindaGeneralConcern
|
|
|
95
95
|
doc = Jinda::Doc.find params[:id]
|
|
96
96
|
if doc.cloudinary
|
|
97
97
|
require 'net/http'
|
|
98
|
-
require
|
|
99
|
-
uri
|
|
98
|
+
require 'uri'
|
|
99
|
+
uri = URI.parse(doc.url)
|
|
100
100
|
data = Net::HTTP.get_response(uri)
|
|
101
|
-
send_data(data.body, :
|
|
101
|
+
send_data(data.body, filename: doc.filename, type: doc.content_type, disposition: 'inline')
|
|
102
102
|
else
|
|
103
|
-
data= read_binary(doc.url)
|
|
104
|
-
send_data(data, :
|
|
103
|
+
data = read_binary(doc.url)
|
|
104
|
+
send_data(data, filename: doc.filename, type: doc.content_type, disposition: 'inline')
|
|
105
105
|
end
|
|
106
106
|
end
|
|
107
107
|
|
|
108
108
|
def doc
|
|
109
109
|
require 'rdoc'
|
|
110
|
-
@app= get_app
|
|
110
|
+
@app = get_app
|
|
111
111
|
@intro = File.read('README.md')
|
|
112
|
-
@print= "<div align='right'><img src='/assets/printer.png'/> <a href='/jinda/doc_print' target='_blank'/>Print</a></div>"
|
|
113
|
-
doc= render_to_string 'doc.md', :
|
|
114
|
-
html= Maruku.new(doc).to_html
|
|
115
|
-
File.open('public/doc.html','w') {|f| f.puts html }
|
|
112
|
+
@print = "<div align='right'><img src='/assets/printer.png'/> <a href='/jinda/doc_print' target='_blank'/>Print</a></div>"
|
|
113
|
+
doc = render_to_string 'doc.md', layout: false
|
|
114
|
+
html = Maruku.new(doc).to_html
|
|
115
|
+
File.open('public/doc.html', 'w') { |f| f.puts html }
|
|
116
116
|
respond_to do |format|
|
|
117
|
-
format.html
|
|
118
|
-
render :
|
|
117
|
+
format.html do
|
|
118
|
+
render plain: @print + html, layout: 'layouts/jqm/_page'
|
|
119
119
|
# render :text=> Maruku.new(doc).to_html, :layout => false
|
|
120
120
|
# format.html {
|
|
121
121
|
# h = RDoc::Markup::ToHtml.new
|
|
122
122
|
# render :text=> h.convert(doc), :layout => 'layouts/_page'
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
123
|
+
end
|
|
124
|
+
format.pdf do
|
|
125
|
+
latex = Maruku.new(doc).to_latex
|
|
126
|
+
File.open('tmp/doc.md', 'w') { |f| f.puts doc }
|
|
127
|
+
File.open('tmp/doc.tex', 'w') { |f| f.puts latex }
|
|
128
|
+
# system('pdflatex tmp/doc.tex ')
|
|
129
|
+
# send_file( 'tmp/doc.pdf', :type => ‘application/pdf’,
|
|
130
|
+
# :disposition => ‘inline’, :filename => 'doc.pdf')
|
|
131
|
+
render plain: 'done'
|
|
132
|
+
end
|
|
133
133
|
end
|
|
134
134
|
end
|
|
135
135
|
|
|
136
136
|
def status
|
|
137
|
-
@xmain= Jinda::Xmain.where(:
|
|
138
|
-
@title= "Task number #{params[:xid]} #{@xmain.name}"
|
|
139
|
-
@backbtn= true
|
|
140
|
-
@xvars= @xmain.xvars
|
|
137
|
+
@xmain = Jinda::Xmain.where(xid: params[:xid]).first
|
|
138
|
+
@title = "Task number #{params[:xid]} #{@xmain.name}"
|
|
139
|
+
@backbtn = true
|
|
140
|
+
@xvars = @xmain.xvars
|
|
141
141
|
# flash.now[:notice]= "รายการ #{@xmain.id} ได้ถูกยกเลิกแล้ว" if @xmain.status=='X'
|
|
142
|
-
ma_log "Task #{@xmain.id} is cancelled" if @xmain.status=='X'
|
|
142
|
+
ma_log "Task #{@xmain.id} is cancelled" if @xmain.status == 'X'
|
|
143
143
|
# flash.now[:notice]= "transaction #{@xmain.id} was cancelled" if @xmain.status=='X'
|
|
144
|
-
rescue
|
|
145
|
-
refresh_to
|
|
144
|
+
rescue StandardError
|
|
145
|
+
refresh_to '/', alert: "Could not find task number <b> #{params[:xid]} </b>"
|
|
146
146
|
end
|
|
147
147
|
|
|
148
|
-
def help
|
|
149
|
-
end
|
|
148
|
+
def help; end
|
|
150
149
|
|
|
151
150
|
def search
|
|
152
|
-
@q
|
|
153
|
-
@title
|
|
154
|
-
@backbtn= true
|
|
155
|
-
@cache= true
|
|
151
|
+
@q = params[:q] || params[:ma_search][:q] || ''
|
|
152
|
+
@title = "Search Result #{@q}"
|
|
153
|
+
@backbtn = true
|
|
154
|
+
@cache = true
|
|
156
155
|
if @q.blank?
|
|
157
|
-
redirect_to
|
|
156
|
+
redirect_to '/'
|
|
158
157
|
else
|
|
159
|
-
|
|
158
|
+
GmaSearch.create q: @q, ip: request.env['REMOTE_ADDR']
|
|
160
159
|
do_search
|
|
161
160
|
end
|
|
162
161
|
end
|
|
163
162
|
|
|
164
163
|
def err404
|
|
165
164
|
# ma_log 'ERROR', 'main/err404'
|
|
166
|
-
flash[:notice] =
|
|
165
|
+
flash[:notice] =
|
|
166
|
+
"We're sorry, but something went wrong. We've been notified about this issue and we'll take a look at it shortly."
|
|
167
167
|
ma_log "We're sorry, but something went wrong. We've been notified about this issue and we'll take a look at it shortly."
|
|
168
168
|
redirect_to '/'
|
|
169
169
|
end
|
|
170
170
|
|
|
171
171
|
def err500
|
|
172
172
|
# ma_log 'ERROR', 'main/err500'
|
|
173
|
-
flash[:notice] =
|
|
173
|
+
flash[:notice] =
|
|
174
|
+
"We're sorry, but something went wrong. We've been notified about this issue and we'll take a look at it shortly."
|
|
174
175
|
ma_log "We're sorry, but something went wrong. We've been notified about this issue and we'll take a look at it shortly."
|
|
175
176
|
redirect_to '/'
|
|
176
177
|
end
|
|
177
|
-
|
|
178
178
|
end
|
|
179
|
-
|