ig3tool 0.2.0 → 0.2.1

data/lib/ui/bibliotheekwindow.rb

@@ -65,7 +65,7 @@ module Ig3tool
 
 			@books_list   = @glade.get_widget("books_list")
 			@loan_list    = @glade.get_widget("loan_list")
-			@loan_list.model = @loan_list_store = Gtk::ListStore.new(Object, String, String, String, String, String)
+			@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")
@@ -76,6 +76,9 @@ module Ig3tool
 			cell.text = date.strftime("%d/%m/%y")
 			ll.foreground = "black"
 			end
+			@loan_list.insert_column(-1, "username", ll) do |tvc, cell, m ,iter|
+			cell.text = $client.person_member(iter[0].member_id).username
+			end
 			@loan_list.insert_column(-1, "memberid", ll) do |tvc, cell, m ,iter|
 			cell.text = iter[0].member_id
 			end
@@ -102,13 +105,11 @@ module Ig3tool
 		end
 
 		def select_book(widget, path, column)
-			puts "-> select_book"
 			iter = widget.model.get_iter(path)
 			_show iter[0]
 		end
 
 		def select_loan(widget, path, column)
-			puts "-> select_loan"
 			iter = widget.model.get_iter(path)
 			@loan_isbn.text = iter[0].isbn
 			loan_isbn_set(nil)
@@ -118,7 +119,6 @@ module Ig3tool
 
 
 		def select_section()
-			puts "-> select_section"
 			#Thread.new do
 			#  if @books_section.active_iter[0].nil?
 			#    books = nil
@@ -130,7 +130,6 @@ module Ig3tool
 		end
 
 		def get_fields
-			puts "-> get_fields"
 			fields = {}
 			@books_fields.each do |k, f|
 				fields[k] = f.text unless f.text.strip.empty?
@@ -140,7 +139,6 @@ module Ig3tool
 		end
 
 		def get_loan_fields
-			puts "-> get_loan_fields"
 			fields = {}
 			@loan_fields.each do |k, f|
 				fields[k] = f.text unless f.text.strip.empty?
@@ -149,7 +147,6 @@ module Ig3tool
 		end
 
 		def books_save(widget)
-			puts "-> books_save"
 			begin
 				$client.bib_add!(get_fields)
 				_update_books_list
@@ -162,7 +159,6 @@ module Ig3tool
 
 		end
 		def loan_extend(widget)
-			puts "-> loan_extend"
 			begin
 				$client.bib_extend!(get_loan_fields)
 				_update_loan_list
@@ -175,11 +171,9 @@ module Ig3tool
 		end
 
 		def hl_loan(a)
-			puts "hl_loan: NYI"
 		end
 
 		def loan_return(widget)
-			puts "-> loan_return"
 			begin
 				$client.bib_return!(get_loan_fields)
 				_update_loan_list
@@ -192,7 +186,6 @@ module Ig3tool
 		end
 
 		def books_delete(widget)
-			puts "-> books_delete"
 			begin
 				$client.bib_remove!(get_fields)
 				_update_books_list
@@ -205,17 +198,14 @@ module Ig3tool
 		end
 
 		def loan_refresh(widget)
-			puts "-> loan_refresh"
 			_update_loan_list
 		end
 
 		def books_refresh(widget)
-			puts "-> books_refresh"
 			_update_books_list
 		end
 
 		def tabfocus(widget, arg0, arg1)
-			puts "-> tabfocus"
 			if arg1 == 1
 				_update_loan_list
 			else
@@ -224,24 +214,19 @@ module Ig3tool
 		end
 
 		def isbn_ins(a,b,c)
-			puts "-> isbn_ins"
 			reset_books_fields(false)
 		end
 		def isbn_del(a,b,c,d)
-			puts "-> isbn_del"
 			reset_books_fields(false)
 		end
 		def loan_isbn_ins(a,b,c,d)
-			puts "-> loan_isbn_ins"
 			@loan_title.text = ""
 		end
 		def loan_isbn_del(a,b,c)
-			puts "-> loan_isbn_del"
 			@loan_title.text = ""
 		end
 
 		def loan_isbn_set(widget)
-			puts "-> loan_isbn_set"
 			begin
 				book = $client.bib_info(@loan_isbn.text)
 				raise Exception, "the ig3tool imps found no such book..." if book.nil?
@@ -255,16 +240,12 @@ module Ig3tool
 
 
 		def books_find(widget)
-			puts "-> books_find"
-			puts "start find"
 			Thread.new do
 				begin
 					books = $client.bib_lookup(get_fields)
 					if books.size == 1
-						puts "find 1"
 						_show(books.first)
 					else
-						puts "find 2"
 						_update_books_list(books)
 					end
 				rescue Exception => e
@@ -272,11 +253,9 @@ module Ig3tool
 					@books_notification.text = e.message.smaller
 				end
 			end
-			puts "end find"
 		end
 
 		def reset_books_fields(all=true)
-			puts "-> reset_books_fields"
 			@books_isbn.text = "" if all
 			@loan_isbn.text = ""
 			@books_title.text = ""
@@ -291,14 +270,12 @@ module Ig3tool
 		end
 
 		def books_clear(widget, all=true)
-			puts "-> books_clear"
 			reset_books_fields(all)
 			#_update_books_list
 		end
 
 
 		def loan_clear(widget, all=true)
-			puts "-> loan_clear"
 			@loan_isbn.text = ""
 			@loan_memberid.text = ""
 			@loan_warranty.text = "5"
@@ -308,10 +285,19 @@ module Ig3tool
 		end
 
 		def loan_loan(widget)
-			puts "-> loan_loan"
 			@loan_notification.text = ""
 			begin
-				$client.bib_loan!(get_loan_fields)
+        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)
 			rescue Exception => e
@@ -370,7 +356,6 @@ module Ig3tool
 		end
 
 		def _show(book)
-			puts "-> _show"
 			@books_isbn.text = book["isbn"]
 			@loan_isbn.text = book["isbn"]
 			@books_title.text = book["title"]
@@ -387,7 +372,6 @@ module Ig3tool
 		end
 
 		def _update_books_list(books=nil, clear=true)
-			puts "-> _update_books_list"
 			@books_notification.text = "loading books..."
 			@books_list_store.clear if clear
 			Thread.new do 
@@ -407,7 +391,6 @@ module Ig3tool
 		end
 
 		def _update_loan_list(clear=true)
-			puts "-> _update_loan_list"
 			@loan_list_store.clear if clear
 			Thread.new do 
 				loans = $client.bib_loans
@@ -420,7 +403,6 @@ module Ig3tool
 
 
 		def _update_sections
-			puts "-> _update_sections"
 			sections = $client.bib_sections
 			sections_model = Gtk::ListStore.new(Object, String)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ig3tool
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kevin Pinte