ig3tool 0.4.5 → 0.4.6

data/lib/ui/bibliotheekwindow.rb

@@ -1,14 +1,5 @@
 require 'time'
 
-begin
-	require "amazon/search"
-	$amazon_loaded = 1
-rescue Exception => e
-	STDERR.puts "Ruby/Amazon kon niet geladen worden: " + e.to_s
-end
-
-
-
 module Ig3tool
 
 	class BibliotheekWindow < GladeHelper
@@ -68,10 +59,10 @@ module Ig3tool
 			@loan_list.model = @loan_list_store = Gtk::ListStore.new(Object, String, String, String, String, String, String)
 			ll = Gtk::CellRendererText.new
 			@loan_list.insert_column(-1, "loan date", ll) do |tvc, cell, m ,iter|
-			cell.text = Time.parse(iter[0].loan_date).strftime("%d/%m/%y")
+			cell.text = iter[0].loan_date.strftime("%d/%m/%y")
 			end
 			@loan_list.insert_column(-1, "return on", ll) do |tvc, cell, m ,iter|
-			date = Time.parse(iter[0].return_date)
+			date = iter[0].return_date
 			ll.foreground = "red" if date > Time.now
 			cell.text = date.strftime("%d/%m/%y")
 			ll.foreground = "black"
@@ -244,7 +235,11 @@ module Ig3tool
 			Thread.new do
 				begin
 					books = $client.bib_lookup(get_fields)
-					if books.size == 1
+					puts books
+					case books.size
+					when 0	#book not found in db
+						_lookup_isbnbook(@books_isbn.text)
+					when 1
 						_show(books.first)
 					else
 						_update_books_list(books)
@@ -288,16 +283,16 @@ module Ig3tool
 		def loan_loan(widget)
 			@loan_notification.text = ""
 			begin
-        fields = get_loan_fields
-        if fields["member"] =~ /[a-zA-Z]+/
-          puts "username ipv barcode: #{fields["member"]}"
-          membership = $client.person_membership(fields["member"])
-          if membership.nil?
-            raise IG3Error, "#{fields["member"]} is not a member..."
-          else
-            fields["member"] = membership.barcode
-          end
-        end
+				fields = get_loan_fields
+				if fields["member"] =~ /[a-zA-Z]+/
+					puts "username ipv barcode: #{fields["member"]}"
+					membership = $client.person_membership(fields["member"])
+					if membership.nil?
+						raise IG3Error, "#{fields["member"]} is not a member..."
+					else
+						fields["member"] = membership.barcode
+					end
+				end
 				$client.bib_loan!(fields)
 				_update_loan_list
 				loan_clear(nil)
@@ -318,44 +313,129 @@ module Ig3tool
 		private
 
 
+		def _lookup_amazon_isbn(isbn,update = true)
+			begin
+				require 'amazon/aws/search'
+			rescue Exception => e
+				STDERR.puts "Ruby/Amazon/Aws/Search kon niet geladen worden: " + e.to_s
+				return {}
+			end
+			#voor amazon bestaan der 2 libs die sterk op elkaar lijke qua naam
+			#juiste is: http://www.caliban.org/ruby/ruby-aws/
 
-		def _lookup_amazon_isbn (isbn)
-			return false unless $amazon_loaded # Indien de amazon gem niet geladen is, return
-			return false unless _isbn?(true,isbn) # Indien strenge test faalt
+			bookhsh = {}
+			token =  "1857ZGN71N9Z8AV4HE02"	#verplaats naar client
+			associate = "wwwinfogroepb-20"
+			#return false unless _isbn?(true,isbn) # Indien strenge test faalt
+			# You need a amazon-dev-token in client.rb
+			#token = CONFIG['amazon-dev-token']
+			#return unless $amazon_loaded and token.instance_of?(String) and not token.empty?
 
-			if isbn.length == 13 # indien in de nieuwe vorm, maak er een oude van
-				isbn = isbn[3..11]
-				sum = 0
-				9.times {|i| sum += isbn[i].chr.to_i * (10 - i) }
-				controlecijfer = 11 - (sum % 11)
-				if controlecijfer != 10
-					isbn = isbn + controlecijfer.to_s
-				else
-					isbn = isbn + "X"
+			begin
+				#req = Amazon::Search::Request.new(CONFIG["amazon-dev-token"],CONFIG["amazon-associates-id"])
+				req = Amazon::AWS::Search::Request.new(token,associate)
+				il = Amazon::AWS::ItemLookup.new("ASIN", {'ItemId' => isbn} )
+				rg = Amazon::AWS::ResponseGroup.new
+				res = req.search(il,rg)
+				#dont ask, feel free to improve (numlock)
+				books = res['item_lookup_response'].to_h
+				moar_book = books['items'].to_h
+				no_idea = moar_book['item']
+				book = no_idea['item_attributes'].to_h
+
+				title = book['product_name'].to_s.strip
+				author = book['author'].to_s.strip
+				publisher = book['manufacturer'].to_s.strip
+
+				bookhsh.store(:title, title)			if title
+				bookhsh.store(:author, author)			if author
+				bookhsh.store(:publisher, publisher)	if publisher
+
+				if update
+					@books_title.text		= title
+					@books_author.text		= author
+					@books_publisher.text	= publisher
+					@books_isbn.text		= isbn
 				end
+				bookhsh
+			rescue Exception => e
+				STDERR.puts e.message
+				@books_notification.text = "Fout: Lookup Amazon: #{e.message.smaller}"
+				{}
 			end
+		end
 
-			# You need a amazon-dev-token in client.rb
-			token = CONFIG['amazon-dev-token']
-			return unless $amazon_loaded and token.instance_of?(String) and not token.empty?
+		def _lookup_isbndb_isbn(isbn,update = true)
+			def fetch(uri_string, limit)		#follow redirects
+				raise "Server loop" if limit < 0
+				response = Net::HTTP.get_response(URI.parse(uri_string))
+				case response
+				when Net::HTTPSuccess	then response
+				when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+				else
+					response.error!
+				end
+			end
+			def process_book(doc,isbn,update)
+				bookhsh = {}
+				doc.elements.each("ISBNdb/BookList/BookData"){|book|
+					#oh god, but title etc has no specific id in the xml, so can't filter on it
+					#processes all the books, although only 1 book should be returned by the server as we search for isbn
+					book.elements.each("Title"){ |_title|
+						title = _title.text.strip
+						bookhsh.store(:title, title)	if title
+					}
+					book.elements.each("AuthorsText"){ |_author|
+						author = _author.text.strip
+						bookhsh.store(:author,author)	if author
+					}
+					book.each_element_with_attribute("publisher_id"){ |_pub|
+						pub = _pub.text.strip
+						bookhsh.store(:publisher,pub)	if pub
+					}
+				}
+				if update
+					@books_author.text		= bookhsh[:author]
+					@books_title.text		= bookhsh[:title]
+					@books_publisher.text = bookhsh[:publisher]
+					@books_isbn.text		= isbn
+				end
+				return bookhsh
+			end
 
 			begin
-				req = Amazon::Search::Request.new(CONFIG["amazon-dev-token"],CONFIG["amazon-associates-id"])
-				res = req.asin_search(isbn)
-				prod = res.products
-				return if prod.length == 0
-				book = prod[0]
-
-				@books_title.text     = book['product_name'].to_s.strip
-				@books_author.text    = book['authors'].join(', ').strip if !book['authors'] and book['authors'].class == "Array" # opgelet,         niets wegdoen!
-				@books_publisher.text = book['manufacturer'].to_s.strip
-				@books_year.text      = book['release_date'].to_s.strip
-			rescue
-				puts e.backtrace
-				_print_msg "Fout: Lookup Amazon: #{$!}", "ISBN: #{isbn}"
+				require 'net/http'
+				require 'rexml/document'
+			rescue Exception => e
+				STDERR.puts "Ruby/ISBN-DB kon niet geladen worden: " + e.to_s
+				{}
 			end
+
+			#move to client (or just leave it here as you really can't do any harm with this key)
+			key = "Y42N22G5"
+			url = "http://isbndb.com/api/books.xml?"
+
+			isbnquery = "index1=isbn&value1=#{isbn}"
+			response = fetch("#{url}access_key=#{key}&#{isbnquery}", 10)
+			doc = REXML::Document.new(response.body)
+			puts "#{url}access_key=#{key}&#{isbnquery}"
+			return process_book(doc,isbn,update)
+
+		rescue Exception => e
+			#in case of an error we return empty hash == no book
+			STDERR.puts e.message
+			@books_notification.text = "Fout: Lookup ISBNDB: #{e.message.smaller}"
+			{}
+		end
+
+		def _lookup_isbnbook(isbn, update = true)
+			bookhsh = {}
+			bookhsh = _lookup_amazon_isbn(isbn,update) if isbn.size == 10
+			bookhsh = _lookup_isbndb_isbn(isbn,update) if bookhsh.size == 0
+			return bookhsh	#hash, either empty or :title, :author, :publisher avail
 		end
 
+
 		def _show(book)
 			@books_isbn.text = book["isbn"]
 			@loan_isbn.text = book["isbn"]
@@ -375,7 +455,7 @@ module Ig3tool
 		def _update_books_list(books=nil, clear=true)
 			@books_notification.text = "loading books..."
 			@books_list_store.clear if clear
-			Thread.new do 
+			Thread.new do
 				books = $client.bib_books if books.nil?
 				unless books.empty?
 					books.each do |b|
@@ -393,7 +473,7 @@ module Ig3tool
 
 		def _update_loan_list(clear=true)
 			@loan_list_store.clear if clear
-			Thread.new do 
+			Thread.new do
 				loans = $client.bib_loans
 				loans.each do |b|
 					@loan_list_store.append[0] = b

data/lib/ui/interne.rb

@@ -27,7 +27,7 @@ module Ig3tool
       @transactions.model = @transactions_store = Gtk::ListStore.new(Object, String, String, String, String, String)
       l = Gtk::CellRendererText.new
       @transactions.insert_column(-1, "time", l) do |tvc, cell, m, iter|
-        cell.text = Time.parse(iter[0].time).strftime("%d/%m %H:%M")
+        cell.text = iter[0].time.strftime("%d/%m/%y %H:%M")
       end
       @transactions.insert_column(-1, "amount", l) do |tvc, cell, m, iter|
         cell.text = iter[0].amount.from_c.to_s

data/lib/ui/printingwindow.rb

@@ -133,7 +133,17 @@ module Ig3tool
 			@log_menu = Gtk::Menu.new
 			log_menu_refund_item = Gtk::MenuItem.new("refund")
 			log_menu_show_item = Gtk::MenuItem.new("show")
+			log_menu_reprint_item = Gtk::MenuItem.new("reprint")
 			# Treeview heeft default Mode Gtk::SELECTION_SINGLE
+			log_menu_reprint_item.signal_connect("activate") {
+				@filteredlog.selection.selected_each do |model, path, iter|
+				logentry = iter[0]
+				# do reprint stuff
+				$client.print_reprint!({ "logid" => logentry["id"]})
+				@notification.text  = "attempting reprint of job #{logentry["job"]} for #{logentry["username"]}"
+				_update_log
+				end
+			}
 			log_menu_show_item.signal_connect("activate") {
 				@filteredlog.selection.selected_each do |model, path, iter|
 				logentry = iter[0]
@@ -158,7 +168,8 @@ module Ig3tool
 			}
 
 			@log_menu.append(log_menu_show_item)
-			@log_menu.append(log_menu_refund_item)  
+			@log_menu.append(log_menu_refund_item)
+			@log_menu.append(log_menu_reprint_item)
 			@log_menu.show_all
 
 		end
@@ -167,7 +178,17 @@ module Ig3tool
 			@log_big_menu = Gtk::Menu.new
 			log_menu_refund_item = Gtk::MenuItem.new("refund")
 			log_menu_show_item = Gtk::MenuItem.new("show")
+			log_menu_reprint_item = Gtk::MenuItem.new("reprint")
 			# Treeview heeft default Mode Gtk::SELECTION_SINGLE
+			log_menu_reprint_item.signal_connect("activate") {
+				@filteredlog.selection.selected_each do |model, path, iter|
+				logentry = iter[0]
+				# do reprint stuff
+				$client.print_reprint!({ "logid" => logentry["id"]})
+				@notification.text  = "attempting reprint of job #{logentry["job"]} for #{logentry["username"]}"
+				_update_log
+				end
+			}
 			log_menu_show_item.signal_connect("activate") {
 				@log.selection.selected_each do |model, path, iter|
 				logentry = iter[0]
@@ -194,6 +215,7 @@ module Ig3tool
 
 			@log_big_menu.append(log_menu_show_item)
 			@log_big_menu.append(log_menu_refund_item)  
+			@log_big_menu.append(log_menu_reprint_item)  
 			@log_big_menu.show_all
 
 		end
@@ -513,10 +535,11 @@ module Ig3tool
 				clear_all(nil)
 			else
 				begin
-					amount = @delta.text.strip.gsub(/,/, ".")
-					if amount.to_f < 0
-						quick_message("\n    the ig3tool imps do not accept negative values...    \n")
-					else
+					#amount = @delta.text.strip.gsub(/,/, ".")
+					amount = @delta.text.strip
+					#if amount.to_f < 0
+					#	quick_message("\n    the ig3tool imps do not accept negative values...    \n")
+					#else
 						$client.print_update!({:username => @username.text, 
 														 :first_name => @firstname.text,
 														 :last_name => @lastname.text,
@@ -527,7 +550,7 @@ module Ig3tool
 						Thread.new do
 							refresh(true)
 						end
-					end
+					#end
 				rescue Exception => e
           @notification.text = (e.class.to_s + " - " + e.message).smaller
 				end

data/lib/ui/protjes.rb

@@ -1,5 +1,13 @@
 require 'time'
 
+class String
+
+	def to_boolean
+		return true if (self == "t" or self.to_i != 0)
+		return false
+	end
+
+end
 
 module Ig3tool
 
@@ -25,6 +33,7 @@ def initialize
 		@add_stock = @glade.get_widget("add_stock")
 		@add_prodcat = @glade.get_widget("add_prodcat")
 		@add_categories = @glade.get_widget("add_categories")
+		@continuous_stock = @glade.get_widget("continuous_stock_check")
 
 		@categories = $client.product_categories.collect {|x| x.name}.sort
 
@@ -96,7 +105,7 @@ def initialize
 		@purchase_log.model = @purchase_log_store = Gtk::ListStore.new(Object, String, String, String, String, String)
 		l = Gtk::CellRendererText.new
 		@purchase_log.insert_column(-1, "time", l) do |tvc, cell, m, iter|
-			cell.text = Time.parse(iter[0].time).strftime("%d/%m/%y")
+			cell.text = iter[0].time.strftime("%d/%m/%y")
 		end
 		@purchase_log.insert_column(-1, "barcode", l) do |tvc, cell, m, iter|
 			cell.text = iter[0].product
@@ -127,7 +136,7 @@ def initialize
 		@spurchase_log.model = @spurchase_log_store = Gtk::ListStore.new(Object, String, String, String, String, String, String)
 		l = Gtk::CellRendererText.new
 		@spurchase_log.insert_column(-1, "time", l) do |tvc, cell, m, iter|
-			cell.text = Time.parse(iter[0].time).strftime("%d/%m/%y")
+			cell.text = iter[0].time.strftime("%d/%m/%y")
 		end
 		@spurchase_log.insert_column(-1, "barcode", l) do |tvc, cell, m, iter|
 			cell.text = iter[0].product
@@ -189,6 +198,8 @@ def initialize
 		@slog_categories.model  = cat6_model
 		@slog_categories.active = 0
 
+		@continuous_stock.active = false
+
 		toggle_purchase_fields(false)
   	_add_clear
   	_purchase_clear
@@ -203,14 +214,6 @@ def initialize
 		@handler4 = @purchase_price.signal_connect("changed"){ price_amount_changed }
 		@handler5 = @purchase_amount.signal_connect("changed"){ price_amount_changed }
 
-		%w(focus-out-event activate).each do |s|
-			@purchase_amount.signal_connect s do
-				if @purchase_price.text.strip.to_c == 0
-					@purchase_price.text = (@purchase_amount.text.strip.to_i * @purchase_debuggers_orig.text.to_f).to_s
-				end
-				false
-			end
-		end
 		#@handler8 = @add_categories.signal_connect("changed"){ refresh }
 		@handler9 = @purchase_categories.signal_connect("changed"){ refresh }
 		@handler10 = @stock_categories.signal_connect("changed"){ refresh }
@@ -229,6 +232,17 @@ def initialize
 			make_eval_widget w
 		end
 		
+		# Update prices after amount change
+		%w(focus-out-event activate).each do |s|
+			@purchase_amount.signal_connect s do
+				number_eval_widget(@purchase_amount, "0.0")
+				if @purchase_price.text.strip.to_c == 0
+					@purchase_price.text = (@purchase_amount.text.strip.to_i * @purchase_debuggers_orig.text.to_f).to_s
+				end
+				false
+			end
+		end
+
     @handler69 = @purchase_debugger.signal_connect("changed"){ purchase_debugger_changed }
     @debugger_stamp = nil
 
@@ -269,7 +283,7 @@ end
 				@purchase_debuggers.text = new.to_i.from_c.to_s
 				@purchase_members.text = afronden(newm).from_c.to_s
 				@purchase_plebs.text = afronden(newp).from_c.to_s
-				@purchase_accept.active = true
+				#@purchase_accept.active = true
 			rescue Exception => e
 				@purchase_debuggers.text = new.to_i.from_c.to_s
 				@purchase_members.text = afronden(new.to_i).from_c.to_s
@@ -550,7 +564,12 @@ end
 			raise Needed, "please scan a barcode" if @add_barcode.text.strip.empty?
 			raise Needed, "please enter a descriptive name" if @add_name.text.strip.empty?
 			raise Needed, "please select a category" if @add_prodcat.active == -1
-			$client.product_save!("barcode" => @add_barcode.text.strip, "name" => @add_name.text.strip, "dprice" => @manage_debuggers.text.strip.to_c, "mprice" => @manage_members.text.strip.to_c, "nmprice" => @manage_plebs.text.strip.to_c, "category" => @categories[@add_prodcat.active])
+			if @continuous_stock.active?
+				cs = 1
+			else
+				cs = 0
+			end
+			$client.product_save!("barcode" => @add_barcode.text.strip, "name" => @add_name.text.strip, "continuous_stock" => cs, "dprice" => @manage_debuggers.text.strip.to_c, "mprice" => @manage_members.text.strip.to_c, "nmprice" => @manage_plebs.text.strip.to_c, "category" => @categories[@add_prodcat.active])
 			_update_add_products(false)
 			@add_notification.text = "the imps saved the product!"
 			_add_clear(false)
@@ -615,6 +634,9 @@ end
 			@add_barcode.text = prod.barcode
 			@add_stock.text = prod.stock
 			@add_name.text = prod.name
+			puts prod.continuous_stock.class
+			puts prod.continuous_stock
+			@continuous_stock.active = prod.continuous_stock.to_boolean
 			@add_prodcat.active = @categories.index(prod.category)
 		rescue Exception => e
 			@add_notification.text = e.message
@@ -635,11 +657,16 @@ end
 			@purchase_name.text = prod.name
 			@purchase_category.text = prod.category
 			price_amount_changed
-			toggle_purchase_fields(true)
+			if prod.continuous_stock.to_boolean
+				toggle_purchase_fields(false)
+				@purchase_notification.text = "this product has a continuous stock"
+			else
+				toggle_purchase_fields(true)
+			end
       Thread.new do
         ps = $client.product_purchases(barcode)
         last_purchase = ps.first
-			  date = Time.parse(last_purchase.time).strftime("%d/%m/%y")
+			  date = last_purchase.time.strftime("%d/%m/%y")
         @purchase_last.text = date
       end
 		rescue Exception => e
@@ -811,6 +838,7 @@ end
 		@add_name.text = ""
 		@add_prodcat.active = -1
 		@add_notification.text = "" if all
+		@continuous_stock.active = false
 	end
 
 	def _purchase_clear(all=true)

data/lib/ui/saleswindow.rb

@@ -9,7 +9,7 @@ module Ig3tool
 			@status = "non member"
 			@target = nil
 
-			@statushash = {0 => "non member", 1 => "debugger"}
+			@statushash = {0 => "non member", 1 => "debugger", 2 => "member"}
 			@statushashi = @statushash.invert
 
 			# init items
@@ -115,20 +115,21 @@ module Ig3tool
 				jaar = Time.werkjaar % 100
 				lidkaartx = sprintf("^00%02d%02d", jaar, jaar+1).to_re
 				if value =~ lidkaartx # yay! fascets! (fascisme?)
-					value = "lidkaart"
+					begin 
+						$client.person_member(value)
+						# als deze lidkaart overeenkomt met een member => 
+						# zet value op member
+						@target = value
+						@status = "member"
+						@member_id.active = @statushashi[@status]
+						puts "member found.."
+					rescue Ig3tool::NotAMember => e
+						# alst gene member is => verkoop een lidkaart :)
+						value = "lidkaart"
+					end
 				end
 			end
 
-			# is het een member?
-			begin
-				memb = $client.person_member(value)
-
-				@target = value
-				@status = "member"
-				@member_id.active = @statushashi[@status]
-				return
-			rescue Exception => e
-			end
 
 			# is het een product?
 			begin
@@ -155,6 +156,7 @@ module Ig3tool
 		end
 
 		def member_changed
+			puts "member_changed"
 			chosen = @member_id.active_text.strip
 			@target = nil
 			
@@ -176,6 +178,7 @@ module Ig3tool
 
 						@target = chosen
 						@status = "member"
+						puts "member found.."
 					rescue NotAMember => e
 					end
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ig3tool
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Kevin Pinte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-30 00:00:00 +02:00
+date: 2008-11-25 00:00:00 +01:00
 default_executable: ig3tool
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,22 +34,17 @@ files:
 - lib/lib
 - lib/glade
 - bin/ig3tool
-- lib/ui/OLD_internewindow.rb
-- lib/ui/OLD_memberswindow.rb
 - lib/ui/loginwindow.rb
 - lib/ui/toolwindow.rb
 - lib/ui/saleswindow.rb
 - lib/ui/printingwindow.rb
-- lib/ui/OLD_productswindow.rb
 - lib/ui/automaatwindow.rb
 - lib/ui/peoplewindow.rb
 - lib/ui/protjes.rb
 - lib/ui/messagebox.rb
 - lib/ui/gladehelper.rb
 - lib/ui/bibliotheekwindow.rb
-- lib/ui/OLD_printenwindow.rb
 - lib/ui/interne.rb
-- lib/ui/OLD_bibwindow.rb
 - lib/lib/errors.rb
 - lib/lib/util.rb
 - lib/glade/stock_bookmark_klein.png