mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +00:00
Fixed a slight issue with string formatting in import_venue
This commit is contained in:
@@ -14,6 +14,7 @@ from RIGS import models
|
|||||||
import reversion
|
import reversion
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
def setup_cursor():
|
def setup_cursor():
|
||||||
try:
|
try:
|
||||||
cursor = connections['legacy'].cursor()
|
cursor = connections['legacy'].cursor()
|
||||||
@@ -79,7 +80,7 @@ def import_vat_rates():
|
|||||||
sql = """SELECT `id`, `start_date`, `start_time`, `comment`, `rate` FROM `vat_rates`"""
|
sql = """SELECT `id`, `start_date`, `start_time`, `comment`, `rate` FROM `vat_rates`"""
|
||||||
cursor.execute(sql)
|
cursor.execute(sql)
|
||||||
for row in cursor.fetchall():
|
for row in cursor.fetchall():
|
||||||
start_at = datetime.combine(row[1], row[2])
|
start_at = datetime.combine(row[1], row[2])
|
||||||
object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=start_at,
|
object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=start_at,
|
||||||
comment=row[3], rate=row[4])
|
comment=row[3], rate=row[4])
|
||||||
if created:
|
if created:
|
||||||
@@ -99,17 +100,18 @@ def import_venues(delete=False):
|
|||||||
sql = """SELECT `venue`, `threephasepower` FROM `eventdetails` WHERE `venue` IS NOT NULL"""
|
sql = """SELECT `venue`, `threephasepower` FROM `eventdetails` WHERE `venue` IS NOT NULL"""
|
||||||
cursor.execute(sql)
|
cursor.execute(sql)
|
||||||
for row in cursor.fetchall():
|
for row in cursor.fetchall():
|
||||||
print("Searching for %s", row[0])
|
print(("Searching for %s", row[0]))
|
||||||
try:
|
try:
|
||||||
object = models.Venue.objects.get(name__iexact=row[0])
|
object = models.Venue.objects.get(name__iexact=row[0])
|
||||||
if not object.three_phase_available and row[1]:
|
if not object.three_phase_available and row[1]:
|
||||||
with transaction.atomic(), reversion.create_revision():
|
with transaction.atomic(), reversion.create_revision():
|
||||||
object.three_phase_available = row[1]
|
object.three_phase_available = row[1]
|
||||||
object.save()
|
object.save()
|
||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
with transaction.atomic(), reversion.create_revision():
|
with transaction.atomic(), reversion.create_revision():
|
||||||
object = models.Venue(name=row[0], three_phase_available=row[1])
|
object = models.Venue(name=row[0], three_phase_available=row[1])
|
||||||
object.save()
|
object.save()
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
# import_people()
|
# import_people()
|
||||||
@@ -117,5 +119,6 @@ def main():
|
|||||||
# import_vat_rates()
|
# import_vat_rates()
|
||||||
import_venues(True)
|
import_venues(True)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
Reference in New Issue
Block a user