ig3tool 0.1.0 → 0.2.0

data/lib/ui/internewindow.rb

@@ -4,7 +4,7 @@ module Ig3tool
 
 		## - Constants ----
 		MENU_PATH = ["Interne", "Interne"]
-		ICON = "emblem-money.png"
+		ICON = "piggy_xsmall.png"
 
 
 		def initialize
@@ -29,18 +29,21 @@ module Ig3tool
 				@list.insert_column(-1, str, r, :text => i)
 			end
 
-			make_debugger_combo @debugger1
+			# Eerste box: standaard huidige debugger, kleur window
+			make_debugger_combo @debugger1, @window
+
+			# Tweede box: standaard kas
 			make_debugger_combo @debugger2
+			@debugger2.active = 0
 
 			@window.show_all
 		end
 
-		def make_debugger_combo(combo) # kas is ook een "debugger"
-			super(combo)
+		def make_debugger_combo(combo, window = nil) # kas is ook een "debugger"
+			super(combo, window)
 			r = combo.model.prepend
 			r[0] = nil
 			r[1] = "kas"
-			combo.active = 0
 		end
 
 		def left_clicked
@@ -58,7 +61,7 @@ module Ig3tool
 			return if username.nil?
 
 			if username != "kas"
-				saldo = $global["client"].interne(username)
+				saldo = $client.interne(username)
 				@saldo.text = saldo.from_c.to_s
 			else
 				@saldo.text = ""
@@ -71,7 +74,7 @@ module Ig3tool
 
 			username = nil if username == "kas"
 
-			transactions = $global["client"].interne_log(username)
+			transactions = $client.interne_log(username)
 			transactions.each do |t|
 				r = m.append
 				r[0] = t.system
@@ -108,8 +111,8 @@ module Ig3tool
 				:amount => amount
 			}
 
-			new_saldo = $global["client"].interne_transfer! args
-			@saldo.text = $global["client"].interne(from).from_c.to_s
+			new_saldo = $client.interne_transfer! args
+			@saldo.text = $client.interne(from).from_c.to_s
 
 			# Fake Debugger1 changed -> updaten log kaderke
 			debugger1_changed

data/lib/ui/loginwindow.rb

@@ -10,8 +10,6 @@ module Ig3tool
 		def initialize(client, &block)
       super("loginwindow.glade", "loginwindow")
 
-			@c = client
-
 			@username = @glade.get_widget("username")
 			@password = @glade.get_widget("password")
 			@apply    = @glade.get_widget("apply")
@@ -27,12 +25,12 @@ module Ig3tool
 			h = {"username" => @username.text, "password" => @password.text}
       @username.text = ""
       @password.text = ""
-			@c.wannabe!(h)
+			$client.wannabe!(h)
       @loginwin.hide
 			@success.call
 		rescue Token => t
 			puts "ERROR: #{t.message}"
-			error_dialog(self, t)
+			Ig3tool::error_dialog(nil, t)
 		end
 		def cancel(widget)
       @username.text = ""

data/lib/ui/memberswindow.rb

@@ -29,7 +29,7 @@ module Ig3tool
 			@notification_label = _get_widget("notification_label")
 
 			_get_widget("first_name").grab_focus
-			statussen = $global["client"].person_statussen
+			statussen = $client.person_statussen
 			make_status_combo(_get_widget("status"), statussen)
 
 			Thread.new do
@@ -90,7 +90,7 @@ module Ig3tool
 			end
 
 			begin
-				people = $global["client"].person_lookup(attrs)
+				people = $client.person_lookup(attrs)
 				_set_people(people)
 			rescue Exception => e
 				_print_msg "Error: Lookup: #{$!}"
@@ -148,7 +148,7 @@ module Ig3tool
 			begin
 				FIELDS.each {|n| _get_widget(n).text = who.send(n.to_sym).to_s }
 
-				ms = $global["client"].person_memberships(who.username)
+				ms = $client.person_memberships(who.username)
 
 
 				if !ms.nil?
@@ -182,7 +182,7 @@ module Ig3tool
 
 		def _delete(who, refresh = true)
 			begin
-				$global["client"].person_remove!({ :username => who.username })
+				$client.person_remove!({ :username => who.username })
 				_clear
 				_update_people if refresh
 			rescue Exception => e
@@ -217,8 +217,8 @@ module Ig3tool
 			if @selected_person.nil? or @selected_person.username != data[:username]
 				# Indien hij nog niet bestaat, aanmaken in de database
 				begin
-					answer = $global["client"].person_add! data
-					@selected_person = $global["client"].person_lookup("username" => data[:username])[0]
+					answer = $client.person_add! data
+					@selected_person = $client.person_lookup("username" => data[:username])[0]
 					iter = _insert_person(@selected_person)
 					@people_view.selection.select_iter(iter)
 				rescue Exception => e
@@ -230,8 +230,8 @@ module Ig3tool
 			else
 				# Anders-> zorg voor update via people.real_id
 				begin
-					answer = $global["client"].person_update! data
-					@selected_person = $global["client"].person_lookup("username" => data[:username])[0]
+					answer = $client.person_update! data
+					@selected_person = $client.person_lookup("username" => data[:username])[0]
 					iter = _insert_person(@selected_person)
 					@people_view.selection.select_iter(iter)
 				rescue Exception => e
@@ -257,7 +257,7 @@ module Ig3tool
 				r[0] = nil
 				r[1] = "Loading..."
 			end
-			people = $global["client"].send(sym)
+			people = $client.send(sym)
 			_set_people(people)
 		end
 

data/lib/ui/newinterne.rb

@@ -0,0 +1,258 @@
+
+require 'time'
+
+module Ig3tool
+
+  class InterneWindow < GladeHelper
+    include GetText
+
+    MENU_PATH = ["Interne", "Interne"]
+    ICON = "piggy_xsmall.png"
+
+
+
+    def initialize
+      super("newinterne.glade")
+
+
+      @action = @glade.get_widget("action")
+      @notification = @glade.get_widget("notification")
+      @message = @glade.get_widget("message")
+      @amount = @glade.get_widget("amount")
+      @saldo = @glade.get_widget("saldo")
+      @from = @glade.get_widget("fromcombo")
+      @to = @glade.get_widget("tocombo")
+
+      @transactions = @glade.get_widget("transactions")
+      @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")
+      end
+      @transactions.insert_column(-1, "amount", l) do |tvc, cell, m, iter|
+        cell.text = iter[0].amount.from_c.to_s
+      end
+      @transactions.insert_column(-1, "from", l) do |tvc, cell, m, iter|
+        cell.text = iter[0].donor
+      end
+      @transactions.insert_column(-1, "to", l) do |tvc, cell, m, iter|
+        cell.text = iter[0].recipient
+      end
+      @transactions.insert_column(-1, "message", l) do |tvc, cell, m, iter|
+        cell.text = iter[0].message
+      end
+
+      add_window_colorer(@from, @window)
+
+      @amount.text = "0.0"
+      #@window.signal_connect("activate-focus") do
+      #  @notification.text = "refreshing..."
+      #  _update_debuggers
+      #  @notification.text = "refresh done"
+      #end
+
+      _update_debuggers
+      _update_transactions
+
+    end
+
+    def refresh(widget)
+      from = @from.active
+      fromusername = @internes[from-1].username
+      setaction(from, @to.active)
+      _update_debuggers_nothread
+      @from.active = from
+      puts "DEBUG: #{fromusername}"
+      interne = $client.interne(fromusername)
+      @saldo.text = interne.saldo.from_c.to_s unless from == 0
+      @saldo.text = "unlimited moneyz" if from == 0
+      if from == 0
+        _update_transactions
+      else
+        _update_transactions(fromusername)
+      end
+    end
+
+    def tochange(widget)
+      setaction(@from.active, @to.active)
+    end
+    def fromchange(widget)
+      setaction(@from.active, @to.active)
+      fromusername = @internes[@from.active-1].username
+      if @from.active != 0
+        interne = $client.interne(fromusername)
+        @saldo.text = interne.saldo.from_c.to_s
+      end
+      @saldo.text = "unlimited moneyz" if @from.active == 0
+      if @from.active == 0
+        _update_transactions
+      else
+        fromusername = @internes[@from.active - 1].username 
+        _update_transactions(fromusername)
+      end
+    end
+    def tossmoney(widget)
+      if @from.active == 0
+        fromusername = "kas"
+      else
+        fromusername = @internes[@from.active-1].username 
+      end
+      if @to.active == 0
+        tousername = "kas"
+      else
+        tousername = @internes[@to.active-1].username
+      end
+      begin
+        amount = @amount.text
+        raise Ig3tool::IG3Error, "uncorrect format for amount" unless amount =~ /\d+(\.\d{1,2}){0,1}/
+        $client.interne_transfer!("from" => fromusername, "to" => tousername, "amount" => @amount.text.strip.to_c, "message" => @message.text.strip) 
+        _clear
+        _update_transactions(fromusername)
+        @notification.text = "transferred #{amount} EUR from #{fromusername} to #{tousername}"
+      rescue Exception => e
+        @notification.text = e.message
+      end
+    end
+    def setaction(from, to)
+      if from == 0
+        fromusername = "kas"
+      else
+        fromusername = @internes[from-1].username 
+      end
+      if to == 0
+        tousername = "kas"
+      else
+        tousername = @internes[to-1].username
+      end
+      @action.set_markup("toss money from <b>#{fromusername}</b> to <b>#{tousername}</b>")
+      @action.set_markup("retract money from kas") if fromusername == "kas"
+      @action.set_markup("deposit money to your interne") if tousername == "kas"
+      @action.set_markup("money masturbation detected!") if from == to
+    end
+
+
+    private
+
+
+    def _clear
+      @amount.text = "0.0"
+      @message.text = ""
+      @saldo.text = ""
+      from = @from.active
+      to = @to.active
+      _update_debuggers
+      @from.active = from
+      @to.active = to
+    end
+    
+    def _update_debuggers_nothread
+        begin
+          @internes = $client.internes
+          from_model = Gtk::ListStore.new(Object, String)
+          to_model = Gtk::ListStore.new(Object, String)
+
+          empty = from_model.append
+          empty[0] = nil
+          empty[1] = "kas"
+          empty2 = to_model.append
+          empty2[0] = nil
+          empty2[1] = "kas"
+
+          @internes.each do |s|
+            row    = from_model.append
+            row[0] = s
+            row[1] = s.username
+            row2    = to_model.append
+            row2[0] = s
+            row2[1] = s.username
+          end
+
+          @from.model = from_model
+          @from.active = 0
+          @from.clear
+          renderer = Gtk::CellRendererText.new
+          @from.pack_start(renderer, true)
+          @from.set_attributes(renderer, :text => 1)
+          @to.model = to_model
+          @to.active = 0
+          @to.clear
+          renderer = Gtk::CellRendererText.new
+          @to.pack_start(renderer, true)
+          @to.set_attributes(renderer, :text => 1)
+        rescue Exception => e
+          @notification.text = e.to_s + e.message
+        end
+    end
+
+
+    def _update_debuggers
+      Thread.new do
+        begin
+          @internes = $client.internes
+          from_model = Gtk::ListStore.new(Object, String)
+          to_model = Gtk::ListStore.new(Object, String)
+
+          empty = from_model.append
+          empty[0] = nil
+          empty[1] = "kas"
+          empty2 = to_model.append
+          empty2[0] = nil
+          empty2[1] = "kas"
+
+          @internes.each do |s|
+            row    = from_model.append
+            row[0] = s
+            row[1] = s.username
+            row2    = to_model.append
+            row2[0] = s
+            row2[1] = s.username
+          end
+
+          @from.model = from_model
+          @from.active = 0
+          @from.clear
+          renderer = Gtk::CellRendererText.new
+          @from.pack_start(renderer, true)
+          @from.set_attributes(renderer, :text => 1)
+          @to.model = to_model
+          @to.active = 0
+          @to.clear
+          renderer = Gtk::CellRendererText.new
+          @to.pack_start(renderer, true)
+          @to.set_attributes(renderer, :text => 1)
+        rescue Exception => e
+          @notification.text = e.to_s + e.message
+        end
+      end
+    end
+
+    def _update_transactions(name=nil)
+      @notification.text = "loading log..."
+      @transactions_store.clear
+      Thread.new do 
+        begin
+          if name.nil?
+            transactionslines = $client.interne_log
+          else
+            transactionslines = $client.interne_log(name, 200)
+          end
+          transactionslines.each do |ll|
+            @transactions_store.append[0] = ll
+          end
+        rescue Exception => e
+          @notification.text = e.message
+        end
+      end
+      @notification.text = ""
+    end
+
+
+
+  end
+
+  register_window(InterneWindow)
+
+end
+
+
+

data/lib/ui/peoplewindow.rb

@@ -16,8 +16,6 @@ module Ig3tool
     def initialize
       super("people.glade")
 
-      @c = $global["client"]
-
       @username = @glade.get_widget("username")
       @firstname = @glade.get_widget("firstname")
       @lastname = @glade.get_widget("lastname")
@@ -81,7 +79,7 @@ module Ig3tool
         @notification.text = "please fill in a username..."
       else
 
-        p = @c.person_lookup("username", username)[0]
+        p = $client.person_lookup("username", username)[0]
         if p.nil?
           @notification.text = "no user with username #{username} found..."
         else
@@ -94,7 +92,7 @@ module Ig3tool
       begin
         barc = @barcode.text
         clear_all(nil)
-        p = @c.person_member(barc)
+        p = $client.person_member(barc)
         _show(p)
       rescue Exception => e
         @notification.text = "no user with barcode #{barc} found..."
@@ -142,7 +140,7 @@ module Ig3tool
       attrs["status"] = @statushashi[@status.active]
 
       begin
-        @c.person_save!(attrs)
+        $client.person_save!(attrs)
         @notification.text =  "Person succesfully saved, clearing the form..."
         sleep 2
         clear_all(nil)
@@ -178,7 +176,7 @@ module Ig3tool
       end
 
       begin
-        people = @c.person_lookup(attrs)
+        people = $client.person_lookup(attrs)
         _show(people[0]) if people.size == 1
         _update_names(people)
       rescue Exception => e
@@ -229,7 +227,7 @@ module Ig3tool
     def _update_hist(username, clear=true)
       @history_store.clear if clear
       Thread.new do
-        hist = @c.person_memberships(username)
+        hist = $client.person_memberships(username)
         hist.each do |m|
           @history_store.append[0] = m
         end
@@ -244,17 +242,17 @@ module Ig3tool
         if people.nil?
           case @statussearch.active
           when -1
-            people = @c.person_everybody
+            people = $client.person_everybody
           when 0
-            people = @c.person_everybody
+            people = $client.person_everybody
           when 1
-            people = @c.person_debuggers
+            people = $client.person_debuggers
           when 2
-            people = @c.person_members
+            people = $client.person_members
           when 3
-            people = @c.person_nonmembers
+            people = $client.person_nonmembers
           when 4
-            people = @c.person_honorarymembers
+            people = $client.person_honorarymembers
           end
         else
           @statussearch.active = -1
@@ -305,10 +303,10 @@ module Ig3tool
           end
         end
         @mobile.text = person["gsm"]
-        #@status.text = @c.person_status(username)
-        membership = @c.person_membership(person["username"])
+        #@status.text = $client.person_status(username)
+        membership = $client.person_membership(person["username"])
         @barcode.text = membership.barcode unless membership.nil? 
-        status = @c.person_status(person["username"])
+        status = $client.person_status(person["username"])
         @status.active = @statushash[status]
         _update_hist(person["username"])
         @notification.text = "the ig3tool imps found #{person["username"]}..."