drg_resources_plugin 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2c1e8d33e4a9cd415707a89a02816b309b668ae
-  data.tar.gz: cef952b2ddebb29d63ba2a3020d575d9bd6e41bf
+SHA256:
+  metadata.gz: dded601b12b36c4c6e51e849f6df0182a798647bac3c4b10e1de925620019100
+  data.tar.gz: 95a5955a9b54431544927406790c0f03651725515b43a43ca8c75d6064e6f51e
 SHA512:
-  metadata.gz: 33df0ef9c4dfab0962b4dd83a28aba1da340b7fd342e6a35151b0748ec9b789358c5dac6c877765f8cb7565d5a32b076e1e638d058e33f9760a18120f618ae1f
-  data.tar.gz: 1f9ac0d09f18cc34f5dbaaa494cdf1135fa7fee3b2428301cdfb054937076424ce18fdb8500883793c819741f54bb17660b1aac5e3991028bf633334169ba5d2
+  metadata.gz: 7fc9d2777264428dc007a2375ab2b1fab63bfa717a935ea0ffce528cb2ae0217a139c3bfa7a42c93309ca593ab5316466a96139dbeb2cac298a9afc4c2c1594b
+  data.tar.gz: 4487e2a5d3b94cbe22ad8e1e5e845112f46c0f077725ca29928c04d464c5fb7f07b5e4c6b6602498a813c0afec624606750fa11e7a1bb7083fa340da5d498469

data/app/assets/javascripts/resources.js

@@ -42,6 +42,11 @@ $('#category').bind('change', function() {
   *******************************************************************/
   $('.resources-table .usage div').on('click',function(e) {
     var url = e.target.getAttribute("data-url");
-    $('#iframe_edit').attr('src', url);    
+//    $('#iframe_edit').attr('src', url);  
+    $('#iframe_edit').bPopup({
+      content:'iframe', //'ajax', 'iframe' or 'image'
+      contentContainer: '.content',
+      loadUrl: url
+    });
   });
 });

data/app/assets/stylesheets/resources.css

@@ -50,7 +50,8 @@
 }
 
 .resources-table .td.name {
-  background-color: #ffe;  
+  background-color: #ccc;
+  padding: 4px;
 }
 
 .resources-table .td div {

data/app/controllers/drgcms_controls/resource_usage_control.rb

@@ -24,7 +24,7 @@
 module DrgcmsControls::ResourceUsageControl
 
 ######################################################################
-# Check if new document can be added
+# Will check if new document can be added.
 ######################################################################
 def dc_before_new()
   unless ( dc_user_has_role('resources-reservation') or dc_user_has_role('admin') )
@@ -35,7 +35,8 @@ def dc_before_new()
 end
 
 ######################################################################
-# Called when new reservation is created.
+# Called when new reservation is created. Fill some default values in
+# the form.
 ######################################################################
 def dc_new_record()
   @record.resource_id = params[:resource_id]
@@ -45,7 +46,7 @@ def dc_new_record()
 end
 
 ######################################################################
-# check if it's OK to delete reservation document.
+# Check if it's OK to delete reservation document.
 ######################################################################
 def can_delete_resource()
 # reservation's time is up  
@@ -55,7 +56,7 @@ def can_delete_resource()
   end
 # not everyone can delete reservation
   unless (@record.dc_user_id == session[:user_id] or dc_user_has_role('admin') )
-    flash[:error] = 'Only owner or administrator can delete document!'
+    flash[:error] = 'Only owner or administrator can delete reservation!'
     return false
   end  
 end

data/app/helpers/resources_helper.rb

@@ -28,11 +28,13 @@ module ResourcesHelper
 def render_usages(resource_usages, date)
   html = ''
   return html if resource_usages.nil?
+#
   resource_usages.each do |usage|
     if usage.time_from <= date.end_of_day and usage.time_to >= date.beginning_of_day
       time1 = usage.time_from < date.beginning_of_day ? '00:00' : usage.time_from.strftime('%H:%M')
       time2 = usage.time_to > date.end_of_day ? '24:00' : usage.time_to.strftime('%H:%M')
       next if time1 == time2
+# url for displaying detail data      
       url   = "/cms/#{usage.id}/edit?form_name=resource_usage_show&table=resource_usage"
       html << %Q[<div title="Click to view" data-url="#{url}"><b>#{time1} - #{time2}</b><br>#{usage.description}</div>]
     end

data/app/helpers/resources_renderer.rb

@@ -28,19 +28,20 @@ class ResourcesRenderer < DcRenderer
 include DcApplicationHelper
   
 ########################################################################
-# Render resources usage.
+# Render resources usage table.
 ########################################################################
 def resources_usage
+# define currently selected week 
   time = Date.parse(@parent.params[:selected_date]) rescue DateTime.now
   date_from = time.beginning_of_week
   date_to   = time.end_of_week
-  
+# scoupe selected resources and usage documents  
   resources = Resource.where(category: @parent.params[:category], active: true).order_by(name: 1).to_a
   ids = resources.inject([]) { |r,e| r << e.id }
   usages = ResourceUsage.where(:resource_id.in => ids)
            .and(:time_from.lt => date_to, :time_to.gt => date_from)
            .order_by(resource_id: 1, time_from: 1).group_by(&:resource_id)
-#
+# render rails usage views
   @parent.render(partial: 'resources/usage', formats: [:html], 
                  locals: { date_from: date_from, date_to: date_to, 
                            resources: resources, usages: usages }) 
@@ -51,8 +52,8 @@ end
 ########################################################################
 def default
   html = @parent.render(partial: 'resources/menu', formats: [:html], locals: { parent: @parent })
-  html << dc_flash_messages <<
-          resources_usage
+# render error messages and usage table
+  html << dc_flash_messages << resources_usage
 end
 
 end

data/app/views/resources/_menu.html.erb

@@ -18,4 +18,7 @@
 <%= javascript_tag(date_picker.js) %>
 <hr class='hr-separator'>
 
-<%= dc_iframe_edit(nil) %>
+<% # = dc_iframe_edit(nil) %>
+<div id='iframe_edit' name='iframe_edit'>
+<div class="content"></div>
+</div>

data/lib/drg_resources_plugin/version.rb

@@ -1,3 +1,3 @@
 module DrgResourcesPlugin
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_resources_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: drg_cms
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ files:
 - lib/drg_resources_plugin/engine.rb
 - lib/drg_resources_plugin/version.rb
 - lib/tasks/drg_resources_plugin_tasks.rake
-homepage: https://www.drgcms.org
+homepage: http://portal.drgcms.org
 licenses:
 - MIT
 metadata: {}
@@ -87,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DRG CMS portal plugin for resource reservation