ig3tool 0.4.0 → 0.4.4

data/lib/ui/interne.rb

@@ -105,7 +105,8 @@ module Ig3tool
       begin
         amount = @amount.text
         raise Ig3tool::IG3Error, "uncorrect format for amount" unless amount =~ /\d+(\.\d{1,2}){0,1}/
-        message = @message.text.strip || "No Message"
+        message = @message.text.strip
+        message = "No message" if message.nil? or message.empty?
         $client.interne_transfer!("from" => fromusername, "to" => tousername, "amount" => @amount.text.strip.to_c, "message" => message) 
         _clear
         _update_transactions(fromusername)

data/lib/ui/peoplewindow.rb

@@ -201,9 +201,9 @@ module Ig3tool
     end
     def select (widget, path, column)
       iter = widget.model.get_iter(path)
-      puts "SELECT"
       clear_all(nil)
-      _show iter[0]
+      u = $client.person_lookup("username", iter[0].username.to_s)[0]
+      _show(u)
     end
 
     def clear_all(widget, clearnotification=true)
@@ -249,9 +249,9 @@ module Ig3tool
         if people.nil?
           case @statussearch.active
           when -1
-            people = $client.person_everybody
+            people = $client.person_people
           when 0
-            people = $client.person_everybody
+            people = $client.person_people
           when 1
             people = $client.person_debuggers
           when 2
@@ -286,7 +286,7 @@ module Ig3tool
 
 
     def _show(person)
-      puts "DEBUG: #{person.inspect}"
+      #puts "DEBUG: #{person.inspect}"
       begin
         @username.text = person["username"]
         @email.text = person["email"]

data/lib/ui/printingwindow.rb

@@ -50,6 +50,7 @@ module Ig3tool
 
 			@filteredlog = @glade.get_widget("filteredlog")
 			@filteredlog.model = @filteredlog_store = Gtk::ListStore.new(Object, String)
+			@last_log_id = 0
 			fl = Gtk::CellRendererText.new
 			@filteredlog.insert_column(-1, "message", fl) do |tvc, cell, m ,iter|
 			if iter[0].category == "print"
@@ -64,6 +65,7 @@ module Ig3tool
 
 			@log = @glade.get_widget("log")
 			@log.model = @log_store = Gtk::ListStore.new(Object)
+			@last_big_log_id = 0
 			l = Gtk::CellRendererText.new
 			@log.insert_column(-1, "time", l) do |tvc, cell, m, iter|
 				cell.text = Time.parse(iter[0].time).strftime("%d/%m %H:%M")
@@ -79,7 +81,7 @@ module Ig3tool
 				cell.text = iter[0].queue
 			end
 			@log.insert_column(-1, "amount", l) do |tvc, cell, m, iter|
-				cell.text = iter[0].amount
+				cell.text = iter[0].amount.from_c.to_s
 			end
 			@log.insert_column(-1, "host", l) do |tvc, cell, m, iter|
 				cell.text = iter[0].host
@@ -90,11 +92,26 @@ module Ig3tool
 			@log.insert_column(-1, "job", l) do |tvc, cell, m, iter|
 				cell.text = iter[0].job
 			end
+			@log.insert_column(-1, "message", l) do |tvc, cell, m, iter|
+				cell.text = iter[0].message
+			end
 
-
-
-			_update_usernames
-			_update_log
+      # externals
+			@ext_debugger = @glade.get_widget("ext_debugger")
+			@ext_notification = @glade.get_widget("ext_notification")
+			@ext_name = @glade.get_widget("ext_name")
+			@ext_contact = @glade.get_widget("ext_contact")
+			@ext_ip = @glade.get_widget("ext_ip")
+			@ext_debt = @glade.get_widget("ext_debt")
+			@ext_list = @glade.get_widget("ext_list")
+			@ext_list.model = @ext_list_store = Gtk::ListStore.new(Object, String)
+			err = Gtk::CellRendererText.new
+			@ext_list.insert_column(-1, "ext", err, :text => 1)
+			@ext_list.enable_search = true
+
+			make_debugger_combo(@ext_debugger)
+
+			refresh(nil)
       @statussearch.active = 0
 			make_menu
 			make_bigmenu
@@ -182,6 +199,69 @@ module Ig3tool
 		end
 
 
+    # funtions for extern tab
+    
+    def ext_apply(w)
+      begin
+      $client.print_update_external!("name" => @ext_name.text.strip, "contact" => @ext_contact.text.strip, "ip" => @ext_ip.text.strip)
+        _ext_clear
+        _update_ext_list
+        @ext_notification.text = "the imps applied your changes!" 
+      rescue Exception => e
+        @ext_notification.text = e.class.to_s + " " + e.message.to_s 
+      end
+    end
+
+    def ext_cancel(w)
+      _ext_clear
+      _update_ext_list
+    end
+
+    def ext_delete(w)
+      begin
+      $client.print_remove_external!("name" => @ext_name.text.strip)
+        _update_ext_list
+        _ext_clear
+        @ext_notification.text = "the imps removed this external!" 
+      rescue Exception => e
+        @ext_notification.text = e.class.to_s + " " + e.message.to_s 
+      end
+    end
+
+    def get_debugger(widget)
+      widget.active_iter[0]
+    end 
+
+
+    def ext_reset(w)
+      begin
+        if @ext_debugger.active == -1
+          @ext_notification.text = "Please select a debugger!"
+        else
+          $client.print_reset_external!("external" => @ext_name.text.strip, "debugger" => get_debugger(@ext_debugger).username)
+          _ext_clear
+          @ext_notification.text = "the imps resetted the debt of this external!"
+        end
+      rescue Exception => e
+        @ext_notification.text = e.class.to_s + " " + e.message.to_s 
+      end
+    end
+
+    def ext_smart_update(w)
+      name = @ext_name.text.strip
+      _ext_show(name)
+    end
+
+    def ext_seleted(w, path, col)
+			name = w.model.get_iter(path)[1]
+      _ext_show(name)
+    end
+
+
+
+    # end of extern
+
+
 
 		def alias_apply(w)
 			begin
@@ -281,8 +361,12 @@ module Ig3tool
 		end
 
 		def refresh(widget) # refreshes the usernames list and the small log
-			_update_usernames
-			_update_log
+			if !@refreshing
+				@refreshing = true
+				_update_usernames
+				_update_log
+				@refreshing = false
+			end
 		end
 
 
@@ -322,6 +406,8 @@ module Ig3tool
 				refresh(nil)
 			when 2
 				_update_aliases(nil)
+			when 3
+				_update_ext_list
 			end
 		end
 
@@ -333,6 +419,8 @@ module Ig3tool
 			else
 				begin
 					user = $client.print_user(@username.text)
+          _ext_clear
+          @ext_contact.text = user.username
 					person = $client.person_lookup({"username" => @username.text})
           raise NotFound, "the ig3tool imps found no such user..." if person.nil?
 					person = person[0]
@@ -351,6 +439,8 @@ module Ig3tool
             raise NotFound, "the ig3tool imps found no such user..." if person.nil? or person.empty?
 						person = person[0]
 						@email.text = person["email"]
+            _ext_clear
+            @ext_contact.text = user.username
 						@saldo.text = "0.0"
 						@firstname.text = person["first_name"]
 						@lastname.text = person["last_name"]
@@ -457,6 +547,8 @@ module Ig3tool
 				user = $client.print_user(username)
 				person = $client.person_lookup({"username", username})[0]
 				@username.text = username
+        _ext_clear
+        @ext_contact.text = username
 				@email.text = person["email"]
 				@saldo.text = user["saldo"].from_c.to_s
 				@firstname.text = person["first_name"]
@@ -473,6 +565,8 @@ module Ig3tool
           raise NotFound, "the ig3tool imps found no such user..." if person.nil? or person.empty?
           person = person[0]
 					@username.text = username
+          _ext_clear
+          @ext_contact.text = username
 					@email.text = person["email"]
 					@saldo.text = "0"
 					@firstname.text = person["first_name"]
@@ -493,6 +587,18 @@ module Ig3tool
 			end
 		end
 
+    def _ext_show(name)
+      begin
+        e = $client.print_external(name)
+        @ext_name.text = e.name
+        @ext_contact.text = e.contact
+        @ext_ip.text = e.ip
+        @ext_debt.text = e.debt.from_c.to_s
+      rescue Exception => e
+          @notification.text = (e.class.to_s + " - " + e.message)
+      end
+    end
+
 		def _update_usernames(clear=true)
 			@usernames.model = nil
 			@usernames_store.clear if clear
@@ -524,28 +630,55 @@ module Ig3tool
 				@aliases.model = @aliases_store
 			end
 		end
+		
+    def _update_ext_list
+			@ext_list.model = nil
+			@ext_list_store.clear
+			Thread.new do 
+				exts = $client.print_externals
+				exts.each do |e|
+					row = @ext_list_store.append
+					row[1] = e.name
+					row[0] = e
+				end
+				@ext_list.model = @ext_list_store
+			end
+		end
 
 
-		def _update_log(clear=true)
-			@filteredlog_store.clear if clear
-			Thread.new do 
-				loglines = $client.print_logs
-				loglines.each do |ll|
-					@filteredlog_store.append[0] = ll
+		def _update_log
+			Thread.new do
+				loglines = $client.print_logs(200, @last_log_id)
+				loglines.reverse.each do |ll|
+					@filteredlog_store.prepend[0] = ll
 				end
+				@last_log_id = loglines.first.real_id
 			end
 		end
 
-		def _update_biglog(clear=true)
-			@log_store.clear if clear
-			Thread.new do 
-				loglines = $client.print_logs
-				loglines.each do |ll|
-					@log_store.append[0] = ll
+		def _update_biglog
+			if !@updating_biglog # sommige kindjes vinden het leuk om op refresh te klikken
+				@updating_biglog = true
+				Thread.new do 
+					loglines = $client.print_logs(200, @last_big_log_id)
+					loglines.reverse.each do |ll|
+						@log_store.prepend[0] = ll
+					end
+					@last_big_log_id = loglines.first.real_id
+					@updating_biglog = false
 				end
 			end
 		end
 
+    def _ext_clear
+      @ext_name.text = ""
+      @ext_contact.text = ""
+      @ext_ip.text = ""
+      @ext_debt.text = ""
+      @ext_notification.text = ""
+      @ext_debugger.active  = -1
+    end
+
 		def quick_message(message, title="ig3tool message")
 			# Create the dialog
 			dialog = Gtk::Dialog.new(title,

data/lib/ui/protjes.rb

@@ -41,6 +41,7 @@ def initialize
 		@purchase_debuggers_orig = @glade.get_widget("purchase_debuggers_orig")
 		@purchase_plebs_orig = @glade.get_widget("purchase_plebs_orig")
 		@purchase_members_orig = @glade.get_widget("purchase_members_orig")
+		@purchase_last = @glade.get_widget("purchase_last")
 		@purchase_debugger = @glade.get_widget("purchase_debugger")
 		@purchase_debuggers = @glade.get_widget("purchase_debuggers")
 		@purchase_plebs = @glade.get_widget("purchase_plebs")
@@ -219,7 +220,21 @@ def initialize
 		 @stock_stock_new].each do |w|
 			make_eval_widget w
 		end
+		
+    @handler69 = @purchase_debugger.signal_connect("changed"){ purchase_debugger_changed }
+    @debugger_stamp = nil
+
+  end
 
+def purchase_debugger_changed
+  puts "debugger changed"
+  @debugger_stamp = Time.now
+end
+
+  def check_purchase_debugger_reset
+    if @debugger_stamp.nil? or ((Time.now - @debugger_stamp).to_i > 300) 
+      @purchase_debugger.active = -1
+    end
   end
 
 def get_debugger(widget)
@@ -317,6 +332,7 @@ end
 	end
 
 	def toggle_price_fields(from_save, bool=nil)
+    # if from_save  = true the saving of prices gets skipped
 		bool = (not @manage_debuggers.sensitive?) if bool.nil?
 		@manage_debuggers.sensitive = bool
 		@manage_debuggers.editable = bool
@@ -395,14 +411,16 @@ end
   end
 
   def add_cancel(widget)
-		toggle_price_fields(false, false)
+		toggle_price_fields(true, false)
 		_add_clear
   end
 	def log_cancel(w)
 		_log_clear
+    _update_log
 	end
 	def slog_cancel(w)
 		_slog_clear
+    _update_slog
 	end
 	def to_purchase(w)
 		@tabs.page = 1
@@ -412,7 +430,7 @@ end
 		begin
 			p = $client.product_lookup(barcode)
 			_update_log(barcode)
-		rescue
+		rescue Needed => e
 			_update_log
 		end
 	end
@@ -421,7 +439,7 @@ end
 		begin
 			p = $client.product_lookup(barcode)
 			_update_slog(barcode)
-		rescue
+		rescue Needed => e
 			_update_slog
 		end
 	end
@@ -453,8 +471,9 @@ end
 	def add_delete(w)
 		begin
 		barcode = @add_barcode.text.strip
-		$client.product_remove!(barcode)
+		$client.product_remove!("barcode" => barcode)
 		_add_clear
+	  _update_add_products(false)
 		rescue Exception => e
 			@add_notification.text = e.message
 		end
@@ -483,6 +502,7 @@ end
 
   def purchase_cancel(widget)
 		_purchase_clear
+    check_purchase_debugger_reset
   end
 
   def price_ins(widget, arg0, arg1, arg2)
@@ -494,6 +514,7 @@ end
 			_update_add_products
 		when 1
 			_update_purchase_products
+      check_purchase_debugger_reset
 		when 2
 			_update_stock_products
 		when 3
@@ -516,6 +537,7 @@ end
 		begin
 			@add_notification.text = "saving product..."
 			toggle_price_fields(true, false)
+      barcode = @add_barcode.text.strip
 			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
@@ -523,6 +545,8 @@ end
 			_update_add_products(false)
 			@add_notification.text = "the imps saved the product!"
 			_add_clear(false)
+      _add_show(barcode)
+      _purchase_show(barcode)
 		rescue Exception => e
 			@add_notification.text = e.message
 		end
@@ -603,6 +627,12 @@ end
 			@purchase_category.text = prod.category
 			price_amount_changed
 			toggle_purchase_fields(true)
+      Thread.new do
+        ps = $client.product_purchases(barcode)
+        last_purchase = ps.first
+			  date = Time.parse(last_purchase.time).strftime("%d/%m/%y")
+        @purchase_last.text = date
+      end
 		rescue Exception => e
 			@purchase_notification.text = e.message
 		ensure
@@ -773,16 +803,19 @@ end
 		@add_prodcat.active = -1
 		@add_notification.text = "" if all
 	end
+
 	def _purchase_clear(all=true)
 		@purchase_members_orig.text = "0.0"
 		@purchase_debuggers_orig.text = "0.0"
 		@purchase_plebs_orig.text = "0.0"
 		@purchase_members.text = ""
 		@purchase_debuggers.text = ""
-		@purchase_debugger.active = -1
+		#@purchase_debugger.active = -1
+    check_purchase_debugger_reset
 		@purchase_plebs.text = ""
 		@purchase_barcode.text = "" if all
 		@purchase_stock.text = ""
+		@purchase_last.text = ""
 		@purchase_amount.text = ""
 		@purchase_price.text = ""
 		@purchase_date.text = Time.now.strftime("%Y-%m-%d")

data/lib/ui/saleswindow.rb

@@ -13,6 +13,9 @@ module Ig3tool
 			@statushashi = @statushash.invert
 
 			# init items
+			@saldo_label = _get_widget("saldo_label")
+			@saldo = _get_widget("saldo")
+
 			@items = _get_widget("list")
 			@items.model = Gtk::ListStore.new(Integer, String, Float, Object, String)
 			r = Gtk::CellRendererText.new
@@ -25,8 +28,37 @@ module Ig3tool
 
 			make_debugger_combo(_get_widget("debugger"), @window)
 			make_eval_widget @glade.get_widget("count"), 1
+
+      toggle_saldo_label(false)
 		end
 
+    def set_saldo(username)
+      begin
+      i = $client.interne(username)
+      @saldo.text = i.saldo.from_c.to_s
+      rescue Exception => e
+        @saldo.text = e.message
+      end
+    end
+
+    def toggle_saldo_label(bool=nil)
+      if bool.nil?
+        if @saldo_label.text.empty?
+          @saldo_label.text = "Saldo:"
+        else
+          @saldo_label.text = ""
+          @saldo.text = ""
+        end
+      else
+        if bool
+          @saldo_label.text = "Saldo:"
+        else
+          @saldo_label.text = ""
+          @saldo.text = ""
+        end
+      end
+    end
+
 		def smartzap_activate
 			value = _get_widget("smartzap").text
 			value.strip!
@@ -36,6 +68,7 @@ module Ig3tool
 			when "non member"
 				@target = nil
 				@status = "non member"
+        toggle_saldo_label(false)
 				@member_id.active = @statushashi[@status]
 				return
 
@@ -51,29 +84,39 @@ module Ig3tool
 
 				# is het een debugger?
 			when /^[a-z-]/i
+
+        play("tetten") if value == "tetten"
+
 				wanted = {"username", value, "status", "debugger"}
 				pers = $client.person_lookup(wanted)
 
-				if pers.empty? # XXX tijdelijk tot we nieuw zapblad hebben
-					wanted = {"first_name", value, "status", "debugger"} 
-					pers = $client.person_lookup(wanted)
-				end
+        unless pers.empty?
+          pers = pers.first
+
+          @status = "debugger"
+          @target = @debugger = pers.username
+          toggle_saldo_label(true)
+          set_saldo(@debugger)
+
+          _get_widget("debugger").model.each do |m, p, i|
+            if i[1] == @target
+              _get_widget("debugger").active_iter = i
+              @member_id.active = @statushashi[@status]
+              return
+            end
+          end if _get_widget("debugger").model # Can be nil if editted too fast
+        end
+        #return
+			end
 
-				unless pers.empty?
-					pers = pers.first
 
-					@status = "debugger"
-					@target = @debugger = pers.username
-
-					_get_widget("debugger").model.each do |m, p, i|
-						if i[1] == @target
-							_get_widget("debugger").active_iter = i
-							@member_id.active = @statushashi[@status]
-							break
-						end
-					end
+			# lidkaart magic: eg scan 000708XXXXX -> lidkaart
+			begin
+				jaar = Time.werkjaar % 100
+				lidkaartx = sprintf("^00%02d%02d", jaar, jaar+1).to_re
+				if value =~ lidkaartx # yay! fascets! (fascisme?)
+					value = "lidkaart"
 				end
-				return
 			end
 
 			# is het een member?
@@ -93,6 +136,9 @@ module Ig3tool
 				qty  = _get_widget("count").text.to_i
 				_add_product(prod, qty)
 				return
+      rescue Exception => e
+        warn "Look mom, it's an airplane!"
+        warn "#{e.class} - #{e.message}"
 			end
 			# het is een vliegtuig!
 		end
@@ -104,6 +150,8 @@ module Ig3tool
 				@target = @debugger = iter[1]
 				@member_id.active = @statushashi[@status]
 			end
+      toggle_saldo_label(true)
+      set_saldo(@debugger)
 		end
 
 		def member_changed
@@ -113,12 +161,16 @@ module Ig3tool
 			case chosen
 				when "non member"
 					@status = "non member"
+          toggle_saldo_label(false)
 
 				when "debugger"
 					@target = @debugger = _get_widget("debugger").active_iter[1]
 					@status = "debugger"
+          toggle_saldo_label(true)
+          set_saldo(@debugger)
 
 				else # member
+          toggle_saldo_label(false)
 					begin
 						memb = $client.person_member(chosen)
 
@@ -163,10 +215,11 @@ module Ig3tool
 		end
 
 		def clear_clicked
+      play("clear")
 			@items.model.clear
-			@status = "non member"
-			@member_id.active = @statushashi[@status]
 			_update_total
+      toggle_saldo_label(false)
+      @member_id.active = 0
 		end
 
 		alias_method :count_activate, :smartzap_activate
@@ -204,7 +257,7 @@ module Ig3tool
 			begin
 				$client.scribble! params
 				clear_clicked
-				# XXX make sound
+				play("scribble")
 			rescue Exception => e
 				puts "Error: #{$!}"
 			end
@@ -222,7 +275,7 @@ module Ig3tool
 				begin
 					$client.kaching! params
 					clear_clicked
-					# XXX make sound
+					play("kaching")
 				rescue Exception => e
 					puts "Error: #{$!}"
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ig3tool
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.4
 platform: ruby
 authors: 
 - Kevin Pinte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 +02:00
+date: 2008-04-25 00:00:00 +02:00
 default_executable: ig3tool
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 description: 
 email: igtool@infogroep.be
@@ -36,7 +36,6 @@ files:
 - bin/ig3tool
 - lib/ui/OLD_internewindow.rb
 - lib/ui/OLD_memberswindow.rb
-- lib/ui/bibwindow.rb
 - lib/ui/loginwindow.rb
 - lib/ui/toolwindow.rb
 - lib/ui/saleswindow.rb
@@ -50,6 +49,7 @@ files:
 - 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
@@ -100,6 +100,14 @@ files:
 - lib/glade/money_xsmall.png
 - lib/glade/members.glade
 - lib/glade/printerlog_xklein.png
+- lib/glade/sound
+- lib/glade/sound/burp.wav
+- lib/glade/sound/kaching.wav
+- lib/glade/sound/cash2.wav
+- lib/glade/sound/scribble.wav
+- lib/glade/sound/cow.wav
+- lib/glade/sound/shaglic1.wav
+- lib/glade/sound/yeahbaby.wav
 - lib/glade/stock_book_xklein.png
 - lib/glade/cola_xsmall.png
 - lib/glade/piggy_small.png