Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch insp-venues Excluding Merge-Ins
This is equivalent to a diff from 6fc5fee06c to 9e19e26e90
|
2022-02-21
| ||
| 12:30 | Merged in the insp-venues branch. This includes skeleton inspection pages. check-in: beb1a14e0f user: ppdb tags: trunk | |
| 11:05 | Update main menu access, and make member tests independent of changes to the test database. Closed-Leaf check-in: 9e19e26e90 user: ppdb tags: insp-venues | |
| 11:03 | Add persons to members for inspection venues. check-in: 8af8128b27 user: ppdb tags: insp-venues | |
|
2022-02-17
| ||
| 11:53 | make_db_connection checks that the thread dbconn exists and is not None before testing whether it is closed. check-in: b977af0f6e user: ppdb tags: trunk | |
|
2022-02-07
| ||
| 18:56 | Create new branch named "insp-venues" check-in: f26fb12350 user: ppdb tags: insp-venues | |
| 18:14 | Merged in the new-insp branch. Regression tests run check-in: 6fc5fee06c user: ppdb tags: trunk | |
| 17:10 | Updates to parsecsv.py check-in: 845a8691fe user: ppdb tags: new_insp | |
|
2022-02-06
| ||
| 08:32 | Updated cleansqlite for the 2022-02-04 tables. check-in: 8875ec83aa user: ppdb tags: trunk | |
Changes to dataconv/cleansqlite.py.
| ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | + - + - - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + |
You should have received a copy of the GNU General Public License
along with this program. If not, see <https:www.gnu.org/licenses/>.
"""
import os
import sys
import sqlite3
import pprint
from time import strftime, localtime
class CleanError(Exception):
""" Raised when an error is detected while cleaning a database """
pass
|
| ︙ | |||
68 69 70 71 72 73 74 75 76 77 78 79 80 81 | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | + + + + + + + + + + |
sys.stdout.flush()
def clean(self):
""" Run the methods to clean the database.
Subclasses should extend this method to run their own cleaning
method before calling this method
"""
self.message( "Correcting persons table...")
self.correct_persons()
self.message( "Correcting regions tables...")
self.correct_regions()
self.message( "Correcting miscellaneous tables...")
self.correct_breed_tables()
self.message( "Correcting sheep transfers...")
self.correct_sheep_transfers()
self.message( "Correcting inspection venues...")
self.clean_insp_venues()
self.message( "Eliminating nulls...")
self.eliminate_nulls()
self.message( "Checking foreign key integrity...")
self.check_integrity()
self.message( "Rationalising phone types...")
self.rationalise_phone_types()
self.message( "Cleaning Areas...")
|
| ︙ | |||
574 575 576 577 578 579 580 | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 | - - + - |
raise CleanError("%s sheep did not have their registering "
"person found." % len(rows))
except sqlite3.Error as err:
raise CleanError("Error testing registering persons: "
"%s" % str(err))
|
| ︙ | |||
915 916 917 918 919 920 921 | 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 | - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
"values(NULL, 3, 3, ?, 'System', ?, ?, 'SSB900', "
"'2021-01-08', '2021-01-08', 4);",
((self.ts_now, row[0], row[1]) for row in rows))
self.db_conn.commit()
except sqlite3.Error as err:
raise CleanError("Error inserting records into sheep_flock_audit: {}".format(err))
|
| ︙ | |||
1274 1275 1276 1277 1278 1279 1280 | 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
""" Correct Inspector name """
c.execute("UPDATE approval SET Inspector_1 = 'JM Watson' "
"WHERE Inspector_1 = 'J.M. Marshall'")
self.db_conn.commit()
except sqlite3.Error as err:
raise CleanError("Correcting inspector name in approval: %s"
% str(err))
|
| ︙ | |||
1471 1472 1473 1474 1475 1476 1477 | 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 | - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - + - - - - + + + + + + + + + + + + + + - + + + + + + + + - + + + + + + + + + + + |
"where sheep_no = 'Z10487';")
self.db_conn.commit()
except Exception as err:
raise CleanError("Error correcting Z0417 and Z10487: {}".format(str(err)))
c.close()
|
Changes to dataconv/convert.py.
| ︙ | |||
395 396 397 398 399 400 401 | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | - + |
# Make a copy of the raw file
try:
shutil.copyfile(sourcedb, self.cleandb)
except shutil.Error as sherr:
ConvertError("Error copying raw sqlite file: %s" % str(sherr))
|
| ︙ |
Changes to dataconv/transform.py.
| ︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | + + |
self.message(" Transforming sheep_flock table...")
self.transform_sheep_flock_table()
self.message(" Transforming sheep identity tables...")
self.transform_sheep_identity_tables()
if not self.nomem:
self.message(" Transforming tag changes...")
self.transform_tag_audit_history()
self.message(" Transforming secondary registration data tables...")
self.transform_regn_secondary_tables()
self.message(" Creating essential views...")
self.create_essential_views()
self.message(" Creating user tables...")
self.create_user_tables()
self.message(" Creating login tables")
self.populate_login_tables()
|
| ︙ | |||
1704 1705 1706 1707 1708 1709 1710 | 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 | - - - - - - - + - - - - - - - - - - - - |
self.create_table('eid_type')
self.populate_table_many('eid_type',
"INSERT INTO eid_type "
"VALUES(?, '', CAST(? as TEXT));",
((t, self.ts_now) for t in ('Bolus', 'Chip', 'Ear Tag')))
|
| ︙ | |||
2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 | 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 | + |
self.curs.executemany("INSERT INTO audit_history "
"VALUES (NULL, 'UPDATE', ?, 'converter', 'Change', "
"'ear_tag', ?, '', ?, ?);", (row for row in ch_rows))
self.dbconn.commit()
except sqlite3.Error as err:
raise TransformError("Error inserting tag change data "
"into audit_history: %s" % str(err))
def transform_regn_secondary_tables(self):
""" Transform the secondary data tables: ai_sires, inspection, inspector and
prp_genetics.
"""
self.message(" creating ai_sires...")
|
| ︙ |
Changes to maketest.py.
| ︙ | |||
158 159 160 161 162 163 164 | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 | - + |
# Tar the files
tarf = "{}.tar.gz".format(os.path.splitext(self.outfile)[0])
print("Creating tar file '{}'".format(tarf))
out = tarfile.open(os.path.join(self.outdir, tarf), 'w:gz')
out.add(self.tsvpath, '')
out.close()
shutil.rmtree(self.tsvpath)
|
| ︙ | |||
263 264 265 266 267 268 269 270 271 272 273 274 275 276 | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | + + |
self.select_flock_related()
self.message(" Resetting transfers...")
self.reset_transfers()
self.message(" Inserting person related records...")
self.select_person_related()
self.message(" Inserting member related records...")
self.select_member_related()
self.message(" Inserting inspection related records...")
self.select_insp_related()
self.message(" Adding record to allow Login and Change Password to be tests...")
self.add_login_test()
self.message(" Creating indexes on new tables...")
for tablename in self.new_tables:
self.create_indexes(tablename)
self.message(" Detaching the 'old' database...")
self.curs.execute("detach database olddb;")
|
| ︙ | |||
705 706 707 708 709 710 711 712 713 714 715 716 717 718 | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 | + + |
def select_member_related(self):
""" Select the member records related to the persons in the person table. """
self.new_table('member')
try:
self.curs.execute("insert into member select * from olddb.member "
"where member_no in (select distinct member_no from person) ;")
self.dbconn.commit()
self.curs.execute("select * from member where member_no = '0833';")
print(f"Member 0833: {self.curs.fetchone()}")
except sqlite3.Error as err:
raise transform.TransformError(
"Error inserting member records: {}".format(str(err)))
self.new_table('mem_pmts')
try:
self.curs.execute("insert into mem_pmts "
|
| ︙ | |||
737 738 739 740 741 742 743 744 745 746 747 748 749 750 | 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | + + + + + + + + + + + + + + + + + + + + + |
self.curs.execute("insert into fbk_order "
"select * from olddb.fbk_order "
"where member_no in (select member_no from member);")
self.dbconn.commit()
except sqlite3.Error as err:
raise transform.TransformError("Error inserting fbk_order records: %s" %
str(err))
def select_insp_related(self):
""" Add member and person records for the inspection venue foreign key constraint """
print("Selecting insp related members")
try:
self.curs.execute("insert into member select * from olddb.member "
"where member_no in "
"(select distinct member_no from olddb.insp_venue) "
"and member_no not in (select member_no from member);")
self.curs.execute("insert into mem_pmts select * from olddb.mem_pmts "
"where member_no in "
"(select distinct member_no from olddb.insp_venue) "
"and member_no not in (select member_no from mem_pmts);")
self.curs.execute("insert into person select * from olddb.person "
"where member_no in "
"(select distinct member_no from olddb.insp_venue) "
"and person_id not in (select person_id from person);")
self.dbconn.commit()
except sqlite3.Error as err:
raise transform.TransformError(
f"Error inserting member records for venues: {str(err)}")
def reset_transfers(self):
""" Remove transfers, either from real transfers or from running
'Update Presumed Dead' that cause errors when running the test suite.
This will need to be updated at intervals as and when test failures are due to
additional transfers
"""
|
| ︙ | |||
776 777 778 779 780 781 782 | 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | - - - + + + |
str(err))
# test_sheep_data.py testcase CA - 47916 should still be in flock 1003
try:
self.curs.execute("delete from transfer where regn_no = '041084' "
"and transfer_date > '2006-09-02';")
self.dbconn.commit()
except sqlite3.Error as err:
|
| ︙ |
Changes to ppdb/config_db.py.
| ︙ | |||
145 146 147 148 149 150 151 152 153 154 155 156 157 158 | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | + + + + + + |
'PUT': ('regsec', 'admin',),
'POST': ('regsec', 'admin',),
'DELETE': ()},})
uri_tree.sheep.insp = sheepuri.Inspection(appconf,
{'tools.check_auth.url_roles': {'GET': ('regsec', 'memsec', 'socsec', 'admin'),
'PUT': ('regsec', 'admin',),
'POST': (),
'DELETE': ()},})
uri_tree.sheep.inspnew = sheepuri.InspNew(appconf,
{'tools.check_auth.url_roles': {'GET': ('regsec', 'admin'),
'PUT': (),
'POST': ('regsec', 'admin',),
'DELETE': ()},})
uri_tree.sheep.nav = sheepuri.Nav(appconf,
{'tools.check_auth.url_roles': {'GET': ('regsec', 'memsec', 'socsec', 'admin'),
'PUT': ('regsec', 'admin',),
'POST': ('regsec', 'admin',),
|
| ︙ |
Changes to ppdb/const.py.
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | - + | """ The absolute path to the package. Initialised at app startup by ppd.py """ JINJA_ENV = None """ The Jinja2 templating environment. Initialised at app startup by ppd.py """ VERSION = '0.93.0' VERSION__doc = """ The PPDB code version """ |
| ︙ |
Changes to ppdb/handlers/sheepuri.py.
| ︙ | |||
841 842 843 844 845 846 847 | 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 | - + - - - - - + - + - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + |
"data": {"flock_no": flockno, "flock_name": flklist[0][1],
"prefixes": prefixes}}
@cherrypy.expose
class Inspection(SheepBase):
""" Sheep inspections.
|
| ︙ |
Changes to ppdb/lib/memlib.py.
| ︙ | |||
610 611 612 613 614 615 616 | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 | + + + + + + + + + + + - + + + + + + + + + + + + + |
with pglib.cursor() as curs:
curs.execute("select e.email_id, e.person_id, e.address, e.comment, "
"e.date_assigned, e.change_reason, e.last_changed "
"from email e "
"where e.email_id = ? and address <> '';",
(email_id,))
return curs.fetchone()
def get_inspectors(status=None):
""" Return the full and trainee inspectors and their status """
with pglib.get_conn():
with pglib.cursor() as curs:
curs.execute("select p.person_id, substring(r.role from 1 for 1) as status,"
" p.initials || ' ' || p.surname as insp_name "
"from person p join person_role r on p.person_id = r.person_id "
"where r.role in ('Inspector', 'Trainee') "
"order by status, p.surname; ")
#~ return [{key: row[key] for key in row.keys()} for row in curs.fetchall()]
return curs.fetchall()
|
| ︙ |
Changes to ppdb/lib/sheep_schema.py.
| ︙ | |||
42 43 44 45 46 47 48 | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | - + - + |
along with this program. If not, see <https://www.gnu.org/licenses/>.
"""
# Disable constant name case warnings
# pylint: disable=C0103
# The schema version
|
| ︙ | |||
926 927 928 929 930 931 932 | 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 | - - - - - - - - - - - - - + + + - - + + + |
"triggers": ["set_ts", "audit_action"],
"select_cols": [0],
"columns": [("eid_type", "VARCHAR(32) PRIMARY KEY"),
("change_reason", "VARCHAR(32) NOT NULL"),
("last_changed", "TIMESTAMP NOT NULL")]
}
|
| ︙ |
Added ppdb/static/js/inspnew.js.