drg_resources_plugin 0.1.1 → 0.1.2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d2c1e8d33e4a9cd415707a89a02816b309b668ae
4
- data.tar.gz: cef952b2ddebb29d63ba2a3020d575d9bd6e41bf
2
+ SHA256:
3
+ metadata.gz: dded601b12b36c4c6e51e849f6df0182a798647bac3c4b10e1de925620019100
4
+ data.tar.gz: 95a5955a9b54431544927406790c0f03651725515b43a43ca8c75d6064e6f51e
5
5
  SHA512:
6
- metadata.gz: 33df0ef9c4dfab0962b4dd83a28aba1da340b7fd342e6a35151b0748ec9b789358c5dac6c877765f8cb7565d5a32b076e1e638d058e33f9760a18120f618ae1f
7
- data.tar.gz: 1f9ac0d09f18cc34f5dbaaa494cdf1135fa7fee3b2428301cdfb054937076424ce18fdb8500883793c819741f54bb17660b1aac5e3991028bf633334169ba5d2
6
+ metadata.gz: 7fc9d2777264428dc007a2375ab2b1fab63bfa717a935ea0ffce528cb2ae0217a139c3bfa7a42c93309ca593ab5316466a96139dbeb2cac298a9afc4c2c1594b
7
+ data.tar.gz: 4487e2a5d3b94cbe22ad8e1e5e845112f46c0f077725ca29928c04d464c5fb7f07b5e4c6b6602498a813c0afec624606750fa11e7a1bb7083fa340da5d498469
@@ -42,6 +42,11 @@ $('#category').bind('change', function() {
42
42
  *******************************************************************/
43
43
  $('.resources-table .usage div').on('click',function(e) {
44
44
  var url = e.target.getAttribute("data-url");
45
- $('#iframe_edit').attr('src', url);
45
+ // $('#iframe_edit').attr('src', url);
46
+ $('#iframe_edit').bPopup({
47
+ content:'iframe', //'ajax', 'iframe' or 'image'
48
+ contentContainer: '.content',
49
+ loadUrl: url
50
+ });
46
51
  });
47
52
  });
@@ -50,7 +50,8 @@
50
50
  }
51
51
 
52
52
  .resources-table .td.name {
53
- background-color: #ffe;
53
+ background-color: #ccc;
54
+ padding: 4px;
54
55
  }
55
56
 
56
57
  .resources-table .td div {
@@ -24,7 +24,7 @@
24
24
  module DrgcmsControls::ResourceUsageControl
25
25
 
26
26
  ######################################################################
27
- # Check if new document can be added
27
+ # Will check if new document can be added.
28
28
  ######################################################################
29
29
  def dc_before_new()
30
30
  unless ( dc_user_has_role('resources-reservation') or dc_user_has_role('admin') )
@@ -35,7 +35,8 @@ def dc_before_new()
35
35
  end
36
36
 
37
37
  ######################################################################
38
- # Called when new reservation is created.
38
+ # Called when new reservation is created. Fill some default values in
39
+ # the form.
39
40
  ######################################################################
40
41
  def dc_new_record()
41
42
  @record.resource_id = params[:resource_id]
@@ -45,7 +46,7 @@ def dc_new_record()
45
46
  end
46
47
 
47
48
  ######################################################################
48
- # check if it's OK to delete reservation document.
49
+ # Check if it's OK to delete reservation document.
49
50
  ######################################################################
50
51
  def can_delete_resource()
51
52
  # reservation's time is up
@@ -55,7 +56,7 @@ def can_delete_resource()
55
56
  end
56
57
  # not everyone can delete reservation
57
58
  unless (@record.dc_user_id == session[:user_id] or dc_user_has_role('admin') )
58
- flash[:error] = 'Only owner or administrator can delete document!'
59
+ flash[:error] = 'Only owner or administrator can delete reservation!'
59
60
  return false
60
61
  end
61
62
  end
@@ -28,11 +28,13 @@ module ResourcesHelper
28
28
  def render_usages(resource_usages, date)
29
29
  html = ''
30
30
  return html if resource_usages.nil?
31
+ #
31
32
  resource_usages.each do |usage|
32
33
  if usage.time_from <= date.end_of_day and usage.time_to >= date.beginning_of_day
33
34
  time1 = usage.time_from < date.beginning_of_day ? '00:00' : usage.time_from.strftime('%H:%M')
34
35
  time2 = usage.time_to > date.end_of_day ? '24:00' : usage.time_to.strftime('%H:%M')
35
36
  next if time1 == time2
37
+ # url for displaying detail data
36
38
  url = "/cms/#{usage.id}/edit?form_name=resource_usage_show&table=resource_usage"
37
39
  html << %Q[<div title="Click to view" data-url="#{url}"><b>#{time1} - #{time2}</b><br>#{usage.description}</div>]
38
40
  end
@@ -28,19 +28,20 @@ class ResourcesRenderer < DcRenderer
28
28
  include DcApplicationHelper
29
29
 
30
30
  ########################################################################
31
- # Render resources usage.
31
+ # Render resources usage table.
32
32
  ########################################################################
33
33
  def resources_usage
34
+ # define currently selected week
34
35
  time = Date.parse(@parent.params[:selected_date]) rescue DateTime.now
35
36
  date_from = time.beginning_of_week
36
37
  date_to = time.end_of_week
37
-
38
+ # scoupe selected resources and usage documents
38
39
  resources = Resource.where(category: @parent.params[:category], active: true).order_by(name: 1).to_a
39
40
  ids = resources.inject([]) { |r,e| r << e.id }
40
41
  usages = ResourceUsage.where(:resource_id.in => ids)
41
42
  .and(:time_from.lt => date_to, :time_to.gt => date_from)
42
43
  .order_by(resource_id: 1, time_from: 1).group_by(&:resource_id)
43
- #
44
+ # render rails usage views
44
45
  @parent.render(partial: 'resources/usage', formats: [:html],
45
46
  locals: { date_from: date_from, date_to: date_to,
46
47
  resources: resources, usages: usages })
@@ -51,8 +52,8 @@ end
51
52
  ########################################################################
52
53
  def default
53
54
  html = @parent.render(partial: 'resources/menu', formats: [:html], locals: { parent: @parent })
54
- html << dc_flash_messages <<
55
- resources_usage
55
+ # render error messages and usage table
56
+ html << dc_flash_messages << resources_usage
56
57
  end
57
58
 
58
59
  end
@@ -18,4 +18,7 @@
18
18
  <%= javascript_tag(date_picker.js) %>
19
19
  <hr class='hr-separator'>
20
20
 
21
- <%= dc_iframe_edit(nil) %>
21
+ <% # = dc_iframe_edit(nil) %>
22
+ <div id='iframe_edit' name='iframe_edit'>
23
+ <div class="content"></div>
24
+ </div>
@@ -1,3 +1,3 @@
1
1
  module DrgResourcesPlugin
2
- VERSION = '0.1.1'
2
+ VERSION = '0.1.2'
3
3
  end
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: drg_resources_plugin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Damjan Rems
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-08 00:00:00.000000000 Z
11
+ date: 2019-09-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '5'
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '5'
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: drg_cms
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ files:
68
68
  - lib/drg_resources_plugin/engine.rb
69
69
  - lib/drg_resources_plugin/version.rb
70
70
  - lib/tasks/drg_resources_plugin_tasks.rake
71
- homepage: https://www.drgcms.org
71
+ homepage: http://portal.drgcms.org
72
72
  licenses:
73
73
  - MIT
74
74
  metadata: {}
@@ -87,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
89
  requirements: []
90
- rubyforge_project:
91
- rubygems_version: 2.6.14.1
90
+ rubygems_version: 3.0.3
92
91
  signing_key:
93
92
  specification_version: 4
94
93
  summary: DRG CMS portal plugin for resource reservation