drg_resources_plugin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e107f96a1a35c8513033e2f42a806747860ac4
-  data.tar.gz: d86ef816c91c546495c853a882486cefeffc8aec
+  metadata.gz: d2c1e8d33e4a9cd415707a89a02816b309b668ae
+  data.tar.gz: cef952b2ddebb29d63ba2a3020d575d9bd6e41bf
 SHA512:
-  metadata.gz: bae22f69c567c280f849f327986f882a4a57ee1213203cfb74050e9ad89e4e34f4f30263518f5b78cb85a1cae175e7b49bbd2a62a778e84065f4c0cb95f0ecf5
-  data.tar.gz: 94cbd3d17b92f842413fff67fa82f463cc667f473b7229a73e29e7c862ece46db6b03720ac89b911fd604c3c01dfc96e1c43f9bd847dc26e228809786e067a1e
+  metadata.gz: 33df0ef9c4dfab0962b4dd83a28aba1da340b7fd342e6a35151b0748ec9b789358c5dac6c877765f8cb7565d5a32b076e1e638d058e33f9760a18120f618ae1f
+  data.tar.gz: 1f9ac0d09f18cc34f5dbaaa494cdf1135fa7fee3b2428301cdfb054937076424ce18fdb8500883793c819741f54bb17660b1aac5e3991028bf633334169ba5d2

data/app/assets/javascripts/resources.js

@@ -1,3 +1,25 @@
+/*
+* Copyright (c) 2018+ Damjan Rems
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 $(document).ready(function() {
 /**********************************************************************

data/app/assets/stylesheets/resources.css

@@ -40,7 +40,7 @@
   border-right: none;
   min-height: 50px;
   vertical-align: central;
-  padding: 2px 0;
+  padding: 0;
 }
 
 .resources-table .th.name, .resources-table .td.name {
@@ -57,8 +57,7 @@
   background-color: #eee;
   padding: 2px;
   border-top: 1px solid #ddd;  
-  border-bottom: 1px solid #ddd;  
-  margin: 2px 0;
+  margin: 0;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -70,4 +69,11 @@
 
 .resources-table {
   border-right: 1px solid #ccc;
+  
+}.resources-table .usage i {
+  padding: 4px;
+}
+
+.resources-table .row {
+  max-width: none;
 }

data/app/controllers/drgcms_controls/resource_usage_control.rb

@@ -1,6 +1,5 @@
-#encoding: utf-8
 #--
-# Copyright (c) 2014+ Damjan Rems
+# Copyright (c) 2018+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,13 +24,20 @@
 module DrgcmsControls::ResourceUsageControl
 
 ######################################################################
-# Called when new reservation is created.
+# Check if new document can be added
 ######################################################################
-def dc_new_record()
+def dc_before_new()
   unless ( dc_user_has_role('resources-reservation') or dc_user_has_role('admin') )
+    params[:return_to] = 'parent.reload'
     flash[:error] = 'No permission for adding reservations!'
     return false
   end
+end
+
+######################################################################
+# Called when new reservation is created.
+######################################################################
+def dc_new_record()
   @record.resource_id = params[:resource_id]
   @record.dc_user_id  = session[:user_id]
   @record.time_from   = params[:current_date]

data/app/helpers/resources_helper.rb

@@ -1,7 +1,29 @@
-module ResourcesHelper
+#--
+# Copyright (c) 2018+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
 
+module ResourcesHelper
 #####################################################################
-#
+# Render single usage.
 #####################################################################
 def render_usages(resource_usages, date)
   html = ''

data/app/helpers/resources_renderer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014+ Damjan Rems
+# Copyright (c) 2018+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,13 +22,13 @@
 #++
 
 ########################################################################
-#
+# Resources usage renderer.
 ########################################################################
 class ResourcesRenderer < DcRenderer
 include DcApplicationHelper
   
 ########################################################################
-# 
+# Render resources usage.
 ########################################################################
 def resources_usage
   time = Date.parse(@parent.params[:selected_date]) rescue DateTime.now
@@ -47,12 +47,12 @@ def resources_usage
 end
 
 ########################################################################
-# default renderer method will render application menu and usage table below.
+# default renderer method will render application menu and usage table.
 ########################################################################
 def default
   html = @parent.render(partial: 'resources/menu', formats: [:html], locals: { parent: @parent })
-  html << dc_flash_messages
-  html << resources_usage#.html_safe
+  html << dc_flash_messages <<
+          resources_usage
 end
 
 end

data/app/models/resource_usage.rb

@@ -1,4 +1,3 @@
-#encoding: utf-8
 #--
 # Copyright (c) 2018+ Damjan Rems
 #
@@ -53,7 +52,7 @@ class ResourceUsage
   belongs_to :resource
   belongs_to :dc_user
   
-  index resource_id: 1
+  index resource_id: 1, time_from: 1
    
   validates :time_from,   presence: true
   validates :time_to,     presence: true
@@ -68,11 +67,11 @@ def free_time_validations
   errors.add(:time_from, "should be less then end time!") if time_from >= time_to
   errors.add(:time_from, "is less then current time!") if time_from <= Time.now
   if ResourceUsage.where(resource_id: resource_id).and({"$or" => [ 
-      {"$and" => [ {:time_from.lt  => time_from}, {:time_to.gt  => time_from} ] },
-      {"$and" => [ {:time_from.lt  => time_to},   {:time_to.gt  => time_to} ] },
-      {"$and" => [ {:time_from.gte => time_from}, {:time_to.lte => time_to} ] }
-      ] }).exists?
-    errors.add(:time_from, "Resource already taken!")
+       {"$and" => [ {:time_from.lt  => time_from}, {:time_to.gt  => time_from} ] },
+       {"$and" => [ {:time_from.lt  => time_to},   {:time_to.gt  => time_to} ] },
+       {"$and" => [ {:time_from.gte => time_from}, {:time_to.lte => time_to} ] }
+       ] }).exists?
+     errors.add(:time_from, "Resource already taken!")
   end                                       
 end
 

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

@@ -2,7 +2,6 @@
 <div class='resources-table' width='99%'>
   <div class="row date">
     <div class="th name"></div>
-    <%# date = date_from; while date < date_to  %>
     <% date_from.step(date_to, 1) do |date| %>
       <div class="th">
         <%= I18n.t('date.day_names')[date.wday] %><br/><%= date.strftime('%d.%m.') %>

data/lib/drg_resources_plugin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_resources_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails