ig3tool 0.1.0 → 0.2.0

data/lib/ui/printenwindow.rb

@@ -104,7 +104,7 @@ module Ig3tool
 			return if username.nil? or username.empty?
 
 			begin
-				user = $global['client'].print_userinfo([ username ])
+				user = $client.print_userinfo([ username ])
 
 				@glade.get_widget('user').text = username # Kan username of alias zijn waarop men zoekt
 				if user.nil?
@@ -152,7 +152,7 @@ module Ig3tool
 			when :adduser
 				@undo.method = :none
 				begin
-					answer = $global['client'].print_delaccount!({ :username => @undo.username })
+					answer = $client.print_delaccount!({ :username => @undo.username })
 					@undo.method = :deluser
 				rescue Exception => e
 					_print_msg "Fout: Undo: #{$!}"
@@ -162,7 +162,7 @@ module Ig3tool
 			when :deluser
 				@undo.method = :none
 				begin
-					answer = $global['client'].print_addaccount!({ :username => @undo.username, :email => @undo.email, :amount => @undo.amount })
+					answer = $client.print_addaccount!({ :username => @undo.username, :email => @undo.email, :amount => @undo.amount })
 					@undo.method = :adduser
 				rescue Exception => e
 					_print_msg "Fout: Undo: #{$!}"
@@ -172,7 +172,7 @@ module Ig3tool
 			when :addcredit
 				@undo.method = :none
 				begin
-					answer = $global['client'].print_addcredit!({ :username => @undo.username, :email => @undo.email, :amount => - @undo.amount })
+					answer = $client.print_addcredit!({ :username => @undo.username, :email => @undo.email, :amount => - @undo.amount })
 					@undo.method = :addcredit
 					@undo.amount = - @undo.amount
 				rescue Exception => e
@@ -212,10 +212,10 @@ module Ig3tool
 				begin
 					# Indien de gebruiker nog niet bestaat, creeer automatisch een account wanneer er
 					# op 'toevoegen krediet' wordt geklikt
-					if !$global['client'].print_userinfo([ username ])
-						$global['client'].print_addaccount!({ :username => username, :email => email })
+					if !$client.print_userinfo([ username ])
+						$client.print_addaccount!({ :username => username, :email => email })
 					end
-					answer = $global['client'].print_addcredit!({ :username => username, :amount => amount })
+					answer = $client.print_addcredit!({ :username => username, :amount => amount })
 					_print_msg "#{@user_entry.text} Gets #{amount} Credits"
 				rescue Exception => e
 					_print_msg "Fout: Toepassen: #{$!}"
@@ -266,7 +266,7 @@ module Ig3tool
 
 		def _unrefund(selected)
 			begin
-				answer = $global['client'].print_unrefund!({ :jobid => selected.jobid }) # TODO-CHECK
+				answer = $client.print_unrefund!({ :jobid => selected.jobid }) # TODO-CHECK
 				@log_list.model.row_changed selection.path, selection # Zorgt voor row update appearance
 				@refund.label = "Terugbetalen"
 			rescue Exception => e
@@ -287,7 +287,7 @@ module Ig3tool
 
 		def _refund(selected)
 			begin
-				answer = $global['client'].print_refund!({ :jobid => selected.jobid })
+				answer = $client.print_refund!({ :jobid => selected.jobid })
 				@log_list.model.row_changed selection.path, selection 
 				@refund.label = "Toch betalen"
 			rescue Exception => e
@@ -299,7 +299,7 @@ module Ig3tool
 			@credits_list.model.model.clear
 			begin
 				# Haal alle printusers hun print-info op
-				answer = $global['client'].print_credits
+				answer = $client.print_credits
 				answer.each { |l| @credits_list.model.model.append[0] = l }
 			rescue Exception => e
 				_print_msg "Fout: Credits: #{$!}"
@@ -310,7 +310,7 @@ module Ig3tool
 			@log_list.model.clear
 			begin
 				# Haal de laatste 50 Printjobs op
-				answer = $global['client'].print_log( [ 50 ] )
+				answer = $client.print_log( [ 50 ] )
 				answer.each { |l| @log_list.model.append[0] = l }
 			rescue Exception => e
 				_print_msg "Fout: Log: #{$!}"

data/lib/ui/printingwindow.rb

@@ -12,8 +12,7 @@ module Ig3tool
 		def initialize
 			super("printing.glade")
 
-			#@c = Client.new("infogroep.be")
-			@c = $global["client"]
+			#$client = Client.new("infogroep.be")
 
 			#bindtextdomain(domain, localedir, nil, "UTF-8")
 			#@glade = GladeXML.new(path_or_data, root, domain, localedir, flag) {|handler| method(handler)}
@@ -93,7 +92,7 @@ module Ig3tool
 				_show(logentry.username)
 			else
 				begin
-					@c.print_refund!({"logid" => logentry["id"]})
+					$client.print_refund!({"logid" => logentry["id"]})
 					@notification.text  = "refunded print of #{logentry["amount"]} to #{logentry["username"]}"
 					_update_log
 				rescue Exception => e
@@ -109,7 +108,7 @@ module Ig3tool
 				_show(logentry.username)
 			else
 				begin
-					@c.print_refund!({"logid" => logentry["id"]})
+					$client.print_refund!({"logid" => logentry["id"]})
 					@notification.text  = "refunded print of #{logentry["amount"]} to #{logentry["username"]}"
 				rescue Exception => e
 					#puts "ERR: " + e.message.to_s
@@ -173,29 +172,29 @@ module Ig3tool
 				clear_all(nil, false)
 			else
 				begin
-					user = @c.print_user(@username.text)
-					person = @c.person_lookup({"username" => @username.text})
+					user = $client.print_user(@username.text)
+					person = $client.person_lookup({"username" => @username.text})
           raise NotFound, "the ig3tool imps found no such user..." if person.nil?
 					person = person[0]
 					@email.text = person["email"]
 					@saldo.text = user["saldo"]
 					@firstname.text = person["first_name"]
 					@lastname.text = person["last_name"]
-					@status.text = @c.person_status(person["username"])
+					@status.text = $client.person_status(person["username"])
 					@notification.text = "the ig3tool imps found #{user["username"]}..."
 					@apply.image = Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
 					@apply.label = Gtk::Stock::ADD
 					@delta.grab_focus
 				rescue Exception => e
 					begin
-						person = @c.person_lookup({"username" => @username.text})
+						person = $client.person_lookup({"username" => @username.text})
             raise NotFound, "the ig3tool imps found no such user..." if person.nil? or person.empty?
 						person = person[0]
 						@email.text = person["email"]
 						@saldo.text = "0"
 						@firstname.text = person["first_name"]
 						@lastname.text = person["last_name"]
-						@status.text = @c.person_status(person["username"])
+						@status.text = $client.person_status(person["username"])
 						@notification.text = "the ig3tool imps found #{person["username"]}..."
 						@apply.image = Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
 						@apply.label = Gtk::Stock::ADD
@@ -247,7 +246,7 @@ module Ig3tool
 
 		def smart_add(widget)
 			begin
-				@c.print_addcredit!({:username => @username.text, :amount => @delta.text})
+				$client.print_addcredit!({:username => @username.text, :amount => @delta.text})
 				@notification.text = "the imps added #{@delta.text} euro's to #{@username.text}'s account..."
 			rescue Exception => e
           @notification.text = (e.class.to_s + " - " + e.message).smaller
@@ -268,7 +267,7 @@ module Ig3tool
 					if amount.to_f < 0
 						quick_message("\n    the ig3tool imps do not accept negative values...    \n")
 					else
-						@c.print_update!({:username => @username.text, 
+						$client.print_update!({:username => @username.text, 
 														 :first_name => @firstname.text,
 														 :last_name => @lastname.text,
 														 :email => @email.text,
@@ -295,14 +294,14 @@ module Ig3tool
 		def _show(username)
 			#puts "show: #{username}"
 			begin
-				user = @c.print_user(username)
-				person = @c.person_lookup({"username", username})[0]
+				user = $client.print_user(username)
+				person = $client.person_lookup({"username", username})[0]
 				@username.text = username
 				@email.text = person["email"]
 				@saldo.text = user["saldo"].from_c.to_s
 				@firstname.text = person["first_name"]
 				@lastname.text = person["last_name"]
-				@status.text = @c.person_status(username)
+				@status.text = $client.person_status(username)
 				@notification.text = "the ig3tool imps found #{username}..."
 				@apply.image = Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
 				@apply.label = Gtk::Stock::ADD
@@ -310,7 +309,7 @@ module Ig3tool
 			rescue Exception => e
 				#puts "EXC: " + e.message
 				begin
-          person = @c.person_lookup({"username", @username.text})
+          person = $client.person_lookup({"username", @username.text})
           raise NotFound, "the ig3tool imps found no such user..." if person.nil? or person.empty?
           person = person[0]
 					@username.text = username
@@ -318,7 +317,7 @@ module Ig3tool
 					@saldo.text = "0"
 					@firstname.text = person["first_name"]
 					@lastname.text = person["last_name"]
-					@status.text = @c.person_status(username)
+					@status.text = $client.person_status(username)
 					@notification.text = "the ig3tool imps found #{username}..."
 					@apply.image = Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
 					@apply.label = Gtk::Stock::ADD
@@ -339,9 +338,9 @@ module Ig3tool
 			@usernames_store.clear if clear
 			Thread.new do 
 				if @statussearch.active > 0
-					users = @c.person_everybody.sort{|x,y| x["username"] <=> y["username"]}
+					users = $client.person_everybody.sort{|x,y| x["username"] <=> y["username"]}
 				else
-					users = @c.print_users
+					users = $client.print_users
 				end
 				users.each do |user|
 					row = @usernames_store.append
@@ -355,7 +354,7 @@ module Ig3tool
 		def _update_log(clear=true)
 			@filteredlog_store.clear if clear
 			Thread.new do 
-				loglines = @c.print_logs
+				loglines = $client.print_logs
 				loglines.each do |ll|
 					@filteredlog_store.append[0] = ll
 				end
@@ -365,7 +364,7 @@ module Ig3tool
 		def _update_biglog(clear=true)
 			@log_store.clear if clear
 			Thread.new do 
-				loglines = @c.print_logs
+				loglines = $client.print_logs
 				loglines.each do |ll|
 					@log_store.append[0] = ll
 				end

data/lib/ui/productswindow.rb

@@ -2,7 +2,7 @@ module Ig3tool
 
 	class ProductsWindow < GladeHelper
 		MENU_PATH = ["Producten", "Producten"]
-		ICON = "emblem-package.png"
+		ICON = "doos_xsmall.png"
 
 		def initialize
 			super("products.glade")
@@ -30,13 +30,15 @@ module Ig3tool
 				s2.add_widget(@glade.get_widget(w))
 			end
 
-			@purchase_list = Gtk::ListStore.new(Object, String, String, Integer, String)
+			@purchase_list = Gtk::ListStore.new(Object, String, String, String, Integer, Integer)
 			@purchase_view.model = @purchase_list
 			renderer = Gtk::CellRendererText.new
 			renderer.xalign = 1
 			@purchase_view.insert_column(-1, "Datum", renderer, :text => 1)
 			@purchase_view.insert_column(-1, "Totaalprijs", renderer, :text => 2)
-			@purchase_view.insert_column(-1, "Aantal", renderer, :text => 3)
+			@purchase_view.insert_column(-1, "Stukprijs", renderer, :text => 3)
+			@purchase_view.insert_column(-1, "Huidig", renderer, :text => 4)
+			@purchase_view.insert_column(-1, "Aantal", renderer, :text => 5)
 
 			renderer = Gtk::CellRendererText.new
 			@products = Gtk::ListStore.new(Object, String)
@@ -45,7 +47,7 @@ module Ig3tool
 
 			cat_model = Gtk::ListStore.new(String)
 			cat_model.prepend[0] = "Alle categorieën"
-			$global["client"].product_categories.collect {|x| x.name}.sort.each do |cat|
+			$client.product_categories.collect {|x| x.name}.sort.each do |cat|
 				r    = cat_model.append
 				r[0] = cat
 			end
@@ -95,18 +97,21 @@ module Ig3tool
 
 		def add_button_clicked
 			return if @selected_product.nil?
-			amount = @new_stock.text
-			price  = @new_price.text
+			amount = @new_stock.text.to_i
+			price  = @new_price.text.to_f
 
-			args = { :debugger => "dharnie",
-				:items => { @selected_product.barcode => [amount, price] } }
+			args = { :debugger => $client.username,
+			         :items    => { @selected_product.barcode => [amount, amount * price.to_c] }
+			}
 
-			$global["client"].product_purchase! args
+			$client.product_purchase! args
+			p = $client.product_purchases(@selected_product.barcode).first
+			_add_purchase(p, false)
 		end
 
 		def category_combo_changed
 			active = @category_combo.active 
-			products = $global["client"].product_all
+			products = $client.product_all
 			if active > 0
 				category = @category_combo.active_iter[0]
 				products = products.select {|p| p.category == category}
@@ -145,14 +150,21 @@ module Ig3tool
 			@purchase_list.clear
 			return if @selected_product.nil?
 			@selected_product.purchases.each do |p|
-				row = @purchase_list.append
-				row[0] = p
-				row[1] = p.time.to_s
-				row[2] = sprintf("%.2f", p.cost.to_s)
-				row[3] = p.count.to_i
+				_add_purchase(p)
 			end
 		end
 
+		def _add_purchase(p, at_end = true)
+			row = at_end ? @purchase_list.append : @purchase_list.prepend
+			row[0] = p
+			row[1] = p.time.to_s
+			row[2] = sprintf("%.2f", p.cost.from_c)
+			row[3] = sprintf("%.2f", p.cost.from_c/p.count.to_i)
+			row[4] = p.current.to_i
+			row[5] = p.count.to_i
+		end
+
+
 	end
 
 	register_window(ProductsWindow)

data/lib/ui/saleswindow.rb

@@ -17,8 +17,12 @@ module Ig3tool
 			@items.insert_column(-1, "Aantal",  r, :text => 0)
 			@items.insert_column(-1, "Product", r, :text => 1)
 			@items.insert_column(-1, "Prijs",   r, :text => 2)
+      @member_id = @glade.get_widget("member_id")
 
 			@window.show
+      @statushash = {1 => "member", 0 => "non-member", 2 => "debugger"}
+      @statushashi = @statushash.invert
+
 		end
 
 		def smartzap_activate
@@ -30,6 +34,7 @@ module Ig3tool
 			when "non member"
 				@target = nil
 				@status = "non member"
+          @member_id.active = @statushashi[@status]
 				return
 
 			when "kaching"
@@ -45,13 +50,14 @@ module Ig3tool
 				# is het een debugger?
 			when /^[a-z]/
 				wanted = {"username", value, "status", "debugger"}
-				pers = $global["client"].person_lookup(wanted)
+				pers = $client.person_lookup(wanted)
 
 				unless pers.empty?
 					pers = pers.first
 
-					@target = pers.username
 					@status = "debugger"
+          @member_id.active = @statushashi[@status]
+					@target = @debugger = pers.username
 
 					_get_widget("debugger").model.each do |m, p, i|
 						if i[1] == @target
@@ -65,17 +71,18 @@ module Ig3tool
 
 			# is het een member?
 			begin
-				memb = $global["client"].membership_lookup(value)
+				memb = $client.membership_lookup(value)
 
 				@target = memb.barcode
 				@status = "member"
+          @member_id.active = @statushashi[@status]
 				return
 			rescue Exception => e
 			end
 
 			# is het een product?
 			begin
-				prod = $global["client"].product_lookup(value)
+				prod = $client.product_lookup(value)
 				qty  = _get_widget("count").text.to_i
 				_add_product(prod, qty)
 				return
@@ -83,6 +90,10 @@ module Ig3tool
 			# het is een vliegtuig!
 		end
 
+		def debugger_changed
+			@debugger = _get_widget("debugger").active_iter[1]
+		end
+
 		def delete_clicked
 			sel = @items.selection.selected
 			@items.model.remove(sel) if sel
@@ -104,6 +115,8 @@ module Ig3tool
 
 		def clear_clicked
 			@items.model.clear
+      @status = "non-member"
+          @member_id.active = @statushashi[@status]
 			_update_total
 		end
 
@@ -127,11 +140,11 @@ module Ig3tool
 			items = _get_items
 
 			return if items.empty?
-			params = { "debugger" => @target,
+			params = { "debugger" => @debugger,
 								 "items"    => items }
 
 			begin
-				$global["client"].scribble! params
+				$client.scribble! params
 				clear_clicked
 				# XXX make sound
 			rescue Exception => e
@@ -142,12 +155,12 @@ module Ig3tool
 		def _kaching
 			items = _get_items
 
-			params = { "debugger" => "dharnie", # XXX get username
+			params = { "debugger" => @debugger, 
 								 "items"    => items,
 								 "status"   => @status }
 
 			begin
-				$global["client"].kaching! params
+				$client.kaching! params
 				clear_clicked
 				# XXX make sound
 			rescue Exception => e

data/lib/ui/toolwindow.rb

@@ -29,9 +29,11 @@ module Ig3tool
 				icon = (klass::ICON || "no.xpm")
 				button = create_button(name, icon.to_s)
 				button.signal_connect("clicked") do
-					@@windows[klass] ||= klass.new
-					@@windows[klass].show
-					@@windows[klass].present
+					Thread.new do
+						@@windows[klass] ||= klass.new
+						@@windows[klass].show
+						@@windows[klass].present
+					end
 				end
 				bigbox.add(button)
 			end

data/lib/utils.rb

@@ -0,0 +1,106 @@
+class Time
+	# bepaling van de week van het academiejaar
+	def week
+		t = start_werkjaar(Time.werkjaar)
+		return 1 + ((self - t) / (86400*7)).to_int
+	end
+
+	# we bepalen de start van het werkjaar (laatste ma van sept)
+	def self.start_werkjaar(jaar)
+		t = Time.mktime(jaar, 9, 30)
+		t = t - 86400 until t.wday == 1
+		t
+	end
+
+	def self.werkjaar
+		t = Time.now()
+		t > start_werkjaar(t.year) ? t.year : t.year - 1
+	end
+end
+
+class Fixnum
+	# Convenience method
+	def weeks
+		self * 86400 * 7
+	end
+end
+
+class Integer
+	def to_b
+		!zero?
+	end
+end
+
+class Array
+	# File facets/conversion.rb, line 38
+	def to_h(arrayed=nil)
+		h = {}
+		if arrayed #or (flatten.size % 2 == 1)
+			#each{ |e| h[e.first] = e.slice(1..-1) }
+			each{ |k,*v| h[k] = v }
+		else
+			h = Hash[*(self.flatten)]
+		end
+		h
+	end
+end
+
+class Hash
+	# File facets/hash/keyize.rb, line 49
+	def normalize_keys!( &block )
+		keys.each{ |k|
+			nk = block[k]
+			self[nk]=delete(k) if nk
+		}
+		self
+	end
+end
+
+# XXX MOVE THIS TO BETTER PLACE
+
+def send_email(from, from_alias, to, to_alias, subject, message)
+	msg = %q{<<END_OF_MESSAGE
+					|From: #{from_alias} <#{from}>
+					|To: #{to_alias} <#{to}>
+					|Subject: #{subject}
+
+					|#{message}}
+
+					Net::SMTP.start('localhost') do |smtp|
+						smtp.send_message msg, from, to
+					end
+end
+
+def email(from, to, subject, message)
+	from_alias = "#{from.first_name} #{from.last_name}"
+	to_alias = "#{to.first_name} #{to.last_name}"
+	send_email(from.email, from_alias, to.email, to_alias, subject, message)
+end
+
+module ActiveRecord
+	class Base
+		def self.hash_lookup(search, valid_keys)
+			search = search.to_h unless search.is_a? Hash
+
+			return find(:all) if search.empty?
+
+			clauses = []
+			values  = []
+			search.normalize_keys! { |k| k.to_s.downcase }
+
+			search.each do |k, v|
+				raise "Invalid search key '#{k}'" unless valid_keys.include? k
+				if %w(barcode username).include? k or k == primary_key
+					clauses << "#{k} = ?"
+					values << v
+				else
+					clauses << "#{k} like ?"
+					v = "%#{v}%"
+					values << v
+				end
+			end
+
+			find(:all, :conditions => [ clauses.join(" AND "), *values ])
+		end
+	end
+end