Merge pull request #15 from ISISComputingGroup/fix_get_exp_data

Fix g.adv.get_exp_data

src/genie_python/genie_experimental_data.py

@@ -7,8 +7,8 @@
 from genie_python.mysql_abstraction_layer import SQLAbstraction
 
 SELECT_FOR_EXP_DETAILS = """
-SELECT e.experimentID, u.name as userName, r.name as roleName,"""
-""" t.startDate, e.duration FROM `experimentteams` t
+SELECT e.experimentID, u.name as userName, r.name as roleName,
+t.startDate, e.duration FROM `experimentteams` t
 JOIN experiment e ON e.experimentID = t.experimentID
 JOIN user u ON u.userID = t.userID
 JOIN role r ON r.roleID = t.roleID
@@ -94,10 +94,10 @@ def get_exp_data(
                 self._pretty_print(exp_data)
             else:
                 raise NotFoundError(
-                    f'Found no experiments that match the given criteria '
-                    f'(RB: {rb if rb != "%" else "Any"}, '
-                    f'User: {user if user != "%" else "Any"}, '
-                    f'Role: {role if role != "%" else "Any"}).\n'
+                    f"Found no experiments that match the given criteria "
+                    f"(RB: {rb if rb != '%' else 'Any'}, "
+                    f"User: {user if user != '%' else 'Any'}, "
+                    f"Role: {role if role != '%' else 'Any'}).\n"
                 )
 
         return exp_data
@@ -169,11 +169,11 @@ def _pretty_print(exp_data: list[_GetExpDataReturn]) -> None:
 
         for exp in exp_data:
             print(
-                f'Experiment RB number: {exp["rb_number"]:{rb_padding}} | '
-                f'User: {exp["user"]:{user_padding}} | '
-                f'Role: {exp["role"]:{role_padding}} | '
-                f'Start date: {exp["start_date"]} | '
-                f'Duration: {exp["duration"]}'
+                f"Experiment RB number: {exp['rb_number']:{rb_padding}} | "
+                f"User: {exp['user']:{user_padding}} | "
+                f"Role: {exp['role']:{role_padding}} | "
+                f"Start date: {exp['start_date']} | "
+                f"Duration: {exp['duration']}"
             )