Commit Graph
100 Commits
Author SHA1 Message Date
Worros bea6bf2d6b Merge branch 'master' of git://git.assembla.com/fpdb-mme
Conflicts:
	pyfpdb/Configuration.py
2009-11-05 12:22:05 +08:00
Worros 5d6138e2a8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-11-05 12:16:32 +08:00
Worros cc89433ba8 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/Configuration.py
2009-11-04 14:44:25 +08:00
Worros f276ad4dfa Merge branch 'master' of git://git.assembla.com/fpdb-mme
Conflicts:
	pyfpdb/Configuration.py
2009-11-03 17:25:54 +08:00
Worros 28ca49d592 Fix GuiSessionStats.py for sqlite
Fix based on solution from Eleatic Stranger on 2+2
2009-11-02 17:23:50 +08:00
Worros f4aa5f1fe1 First fix for sqlite in PlayerStats
Fix courtesy of Eleatic Stranger on 2+2 - Page still does not work, need to find an sqlite equivalent to to_char() and variance()
2009-11-02 13:38:36 +08:00
Worros d5604e0e73 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-31 08:57:04 +08:00
Worros ae7e721ede Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-31 08:56:36 +08:00
Worros ce0e2c139b Revert "Print out actual exception when import fails"
This reverts commit 626ff49eb4.

Turns out this commit is python 2.6 syntax
2009-10-31 08:55:54 +08:00
Worros c56f9c28fd Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-30 14:37:05 +08:00
Worros 3f09bf3d65 Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-30 14:36:42 +08:00
Worros 636727ebb6 Start of Partouche support, shift NEWIMPORT functions 2009-10-30 14:35:45 +08:00
Worros a872769b2b Fix cli to Everleaf 2009-10-29 16:37:33 +08:00
Worros 626ff49eb4 Print out actual exception when import fails 2009-10-29 13:17:17 +08:00
Worros d80360b3bb Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-29 12:28:48 +08:00
Worros 159c39245f Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-28 10:14:19 +08:00
Worros 57f05ba2fb Merge branch 'master' of git://git.assembla.com/fpdb-mme 2009-10-28 00:21:13 +08:00
Worros bef37abbf5 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2009-10-28 00:20:55 +08:00
Worros 6cb16df055 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-28 00:20:44 +08:00
Worros 69ece6eeba Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-28 00:20:26 +08:00
Worros 2be3ab8897 Add Stars icon to folder 2009-10-27 13:18:51 +08:00
Worros ef39f5858e Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-27 11:40:18 +08:00
Worros 9144c7ae68 Revert "Merge branch 'master' of git://git.assembla.com/fpdb-mme"
This reverts commit 1f07fa9a14.
2009-10-27 11:28:27 +08:00
Worros 6b7b46754c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-26 23:00:08 +08:00
Worros 9360bd6894 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-26 17:27:29 +08:00
Worros 115c44e7b1 Move session stats query into SQL.py 2009-10-26 16:39:37 +08:00
Worros e0c193b77d Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-10-26 14:41:11 +08:00
Worros 1f07fa9a14 Merge branch 'master' of git://git.assembla.com/fpdb-mme
Conflicts:
	docs/tabledesign.html
	pyfpdb/CarbonToFpdb.py
	pyfpdb/Configuration.py
	pyfpdb/Database.py
	pyfpdb/EverleafToFpdb.py
	pyfpdb/FpdbSQLQueries.py
	pyfpdb/GuiAutoImport.py
	pyfpdb/GuiBulkImport.py
	pyfpdb/GuiGraphViewer.py
	pyfpdb/GuiPlayerStats.py
	pyfpdb/GuiTableViewer.py
	pyfpdb/HUD_config.xml.example
	pyfpdb/HUD_main.py
	pyfpdb/HandHistoryConverter.py
	pyfpdb/Hud.py
	pyfpdb/Mucked.py
	pyfpdb/SQL.py
	pyfpdb/Stats.py
	pyfpdb/Tables.py
	pyfpdb/fpdb.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
	pyfpdb/upd_indexes.sql
2009-10-26 14:40:11 +08:00
Worros 71eb683a3d Make cash cols sortable.
After sqlcoders effort this appears to work
2009-10-26 12:16:20 +08:00
Worros 0b049a128b Make green in PlayerStats darker 2009-10-25 20:51:46 +08:00
Worros 73e8544117 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-25 20:49:39 +08:00
Worros 914f930c5b GuiSessionViewer update.
Getting closer - added player and date tests. Not convinced the data coming back is koshur though - got a $3600 day in the middle of my data
2009-10-23 15:01:02 +08:00
Worros a2309f704c More GuiSessionViewer updates
Getting closer to a decent layout
2009-10-23 13:50:06 +08:00
Worros 397f654789 GuiSession viewer update.
Still broken, got the math right in preparation for candlestick graph
2009-10-22 14:09:36 +08:00
Worros 58707d2022 Update GuiSessionViewer.
Still horribly broken, but on its way
2009-10-21 17:22:47 +08:00
Worros 4f754fa881 Add some prep work for sorting the stats page 2009-10-20 12:06:29 +08:00
Worros b39f766941 Color cash columns in red and green 2009-10-19 19:39:46 +08:00
Worros cfc854ab50 Fix some bugs in BetfairToFpdb.
As reported by tchaz on 2+2:

http://forumserver.twoplustwo.com/showpost.php?p=13870274&postcount=1960

Using the only sample file I have for Betfair, it appears there is still and accounting error
2009-10-18 07:56:34 +08:00
Worros 639036871b HUD_config.xml.example update
Added Betfair to default config - copied Party.

Also went through and cleaned up whitespace in that file at the same time - tabs to spaces, cleaned trailing spaces.
2009-10-18 07:54:41 +08:00
Worros ceaa78bdc8 Add usage message to GuiBulkImport cli
I keep forgetting the format for Full Tilt cli import
2009-10-15 15:23:47 +08:00
Worros c3bc165a90 Add comment to DerivedStats 2009-10-15 15:13:09 +08:00
Worros 7a9237b707 GuiBulkImport - make cli version print out import stats 2009-10-15 15:12:08 +08:00
Worros 2e2531c0e4 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-10-15 14:55:21 +08:00
Worros 2d9b92af90 Make GuiBulkImport allow multi-file select 2009-10-15 11:57:42 +08:00
Worros 16d1f43c7e [NEWIMPORT] HandsPlayers.streetXAggr insert. 2009-10-14 23:55:51 +08:00
Worros 7b2c1fa243 [NEWIMPORT] Minor update, use DerivedStats.getStats() 2009-10-14 20:28:07 +08:00
Worros 2350474d38 [NEWIMPORT] Start of HandsPlayers insert 2009-10-14 20:20:17 +08:00
Worros f0f2bcda14 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-14 12:06:01 +08:00
Worros 1fc015b09f [NEWIMPORT] Move db insert into SQL.py (store_hand) 2009-10-14 12:05:17 +08:00
Worros 843bd754f6 [NEWIMPORT] Prep insert functions
Cleaned up storeHandsPlayers and added storeHudCacheNew

Haven't decided on the data structures to be passed in as yet so the functions only insert the bare minimum and have a list of commented out variables
2009-10-13 17:42:02 +08:00
Worros 4d04a4b1db [NEWIMPORT] Take a copy of generateHudCache for DerivedStats
Commented out, should give a good basis for generating the stats from Hand class
2009-10-13 17:30:49 +08:00
Worros f4887235a0 [NEWIMPORT] Fix Hand import so it runs
Also comment out some debug
2009-10-13 15:58:05 +08:00
Worros 00a8593631 Fix table re-create bug in fillDefaultData 2009-10-13 14:12:25 +08:00
Worros 1d0177f6d4 [NEWIMPORT] Finish up Hand import
Decided to leave streetXRaisesN alone for the moment
2009-10-13 14:04:19 +08:00
Worros e7a7229dc0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-13 13:22:08 +08:00
Worros 035b71b018 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-12 10:20:22 +08:00
Worros 6d0ec5d831 [NEWIMPORT] Add playersAtStreetX to insert 2009-10-08 18:13:13 +08:00
Worros cf6c3c8ad0 [NEWIMPOR] Fix playersVpi from last patch
Oops - forgot to add the argument
2009-10-08 18:07:54 +08:00
Worros 31f48c4932 [NEWIMPORT] Calculate playersAtStreetX
Untested code.

Still missing playersAtShowdown, haven't looked to see if hand.actionStreets contains showdown.
2009-10-08 18:01:49 +08:00
Worros 024618235f Clean up variables in DerivedStats
Doesn't look like they are going to be used like that
2009-10-07 14:15:12 +08:00
Worros fdef5b12d9 Add playersVpi to NEWIMPORT code
Untested at the moment, moved the code from Hand.py into DerivedStats.
2009-10-06 18:30:52 +08:00
Worros 94af5b1ea8 Fix order bug for seats in NEWIMPORT 2009-10-06 12:08:20 +08:00
Worros 230eb32615 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-10-06 11:11:58 +08:00
Worros d36d8f4249 From 7d5a3e81a5d41298ab1fa4d57bef25862a167350 Mon Sep 17 00:00:00 2001
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:16:06 -0500
Subject: [PATCH] Detect and import capped 6 max hands on FullTilt

and

From b35d23aba38935406cf1522ae07a49cd441318b3 Mon Sep 17 00:00:00 2001
From: lucktard <ntogden@gmail.com>
Date: Wed, 30 Sep 2009 12:21:34 -0500
Subject: [PATCH] Detect deep 6 max tables for HUD on FT
2009-10-01 10:49:59 +08:00
Worros a20bfe0921 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2009-09-23 13:22:45 +08:00
Worros 4e361e383c Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-23 13:22:35 +08:00
Worros 89f86dd32b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-22 12:35:11 +08:00
Worros 2cea6f01b9 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-09-19 19:25:01 +08:00
Worros 577beed942 Prep new function - commented out for the moment 2009-09-19 19:24:07 +08:00
Worros 9e30336acc Remove BOM from AbsoluteToPoker.py 2009-09-06 22:40:27 +08:00
Worros 4f98b29b26 Merge branch 'master' of git://git.assembla.com/fpt_fpdb
Conflicts:
	pyfpdb/Database.py
2009-09-04 12:45:49 +08:00
Worros b52ceb3f90 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2009-09-03 21:37:57 +08:00
Worros c350d62089 Fix typos 2009-09-03 15:44:28 +08:00
Worros b4ccc7f45c Add guards around numpy in GuiSessionViewer for windows users 2009-09-03 11:29:30 +08:00
Worros c80bb3ac3f sys.exit() in Hand.addShownCards() has to be wrong 2009-09-01 18:35:40 +08:00
Worros 0877e428ef Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-18 18:46:15 +08:00
Worros 4cc08763fc Add query getPlayerIdBySite 2009-08-18 18:44:47 +08:00
Worros 6648036399 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 23:38:54 +08:00
Worros dede86521a Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-15 19:06:39 +08:00
Worros ecad66f7d8 Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2009-08-15 19:06:18 +08:00
Worros 116141b833 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:53:49 +08:00
Worros 0baabb0368 Merge branch 'master' of git://github.com/grindi/fpdb-grindi
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:51:49 +08:00
Worros cfd7b40ab6 Merge branch 'master' of git://repo.or.cz/fpbd-bostik
Conflicts:
	pyfpdb/HandHistoryConverter.py
2009-08-12 22:49:18 +08:00
Worros 5a4bcf3997 Add streetXPot and showdownPot to hhc insert
totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents
2009-08-12 22:21:54 +08:00
Worros 483334b899 Fix Absolute plugin from recent change 2009-08-12 18:34:17 +08:00
Worros 6b4d065f9e Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-12 00:05:21 +08:00
Worros 836cba6594 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-11 20:56:43 +08:00
Worros 24e5c2252d Fix inserting into Gametypes 2009-08-11 20:52:07 +08:00
Worros d6529ab42f Import Hand.insert() work
storeHand updated, almost works, just violating some NOT NULL contraints
2009-08-09 01:59:44 +08:00
Worros a24fe93612 Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 21:25:57 +08:00
Worros a70bd9742d Add Gametype insert
Almost done, need to convert 0.25 to 25 for the database - Lookup?
2009-08-08 16:43:52 +08:00
Worros 5550166f37 Start of storeHand from HHC code
Currently cant actually insert as we need the fk gametypeid
2009-08-08 16:15:36 +08:00
Worros 679393e78d Minor change to insertPlayer() 2009-08-08 14:59:23 +08:00
Worros cbc010155d Add commented out sqlite db option to example config 2009-08-08 13:58:56 +08:00
Worros 4ef4d22c94 Add back in sqlcoders changes for sqlite - fix Grapher 2009-08-08 13:56:53 +08:00
Worros 1dcecf4ae3 Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:
	pyfpdb/fpdb_simple.py
2009-08-08 13:10:25 +08:00
Worros 470d34c65c Merge branch 'master' of git://github.com/grindi/fpdb-grindi 2009-08-08 13:06:41 +08:00
Worros 150d8f7160 Revert "Make sure the db connection is encoded using utf8"
This reverts commit 2c9982cfff.
2009-08-08 13:02:29 +08:00
Worros 08a70b75f2 Fix insertPlayer so that it works again 2009-08-08 12:33:25 +08:00
Worros 56ea7c6eab Add incomplete version of PartyPoker plugin 2009-08-06 21:14:52 +08:00