diff --git a/students/template_student/lesson00/oo_class.py b/students/Justin_Jameson/lesson00/oo_class.py old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson00/oo_class.py rename to students/Justin_Jameson/lesson00/oo_class.py diff --git a/students/template_student/lesson00/oo_inherit.py b/students/Justin_Jameson/lesson00/oo_inherit.py old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson00/oo_inherit.py rename to students/Justin_Jameson/lesson00/oo_inherit.py diff --git a/students/Justin_Jameson/lesson01/activity/.idea/activity.iml b/students/Justin_Jameson/lesson01/activity/.idea/activity.iml new file mode 100644 index 0000000..f3d7bc9 --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/activity.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/activity/.idea/encodings.xml b/students/Justin_Jameson/lesson01/activity/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/activity/.idea/misc.xml b/students/Justin_Jameson/lesson01/activity/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/activity/.idea/modules.xml b/students/Justin_Jameson/lesson01/activity/.idea/modules.xml new file mode 100644 index 0000000..2b39da0 --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/activity/.idea/vcs.xml b/students/Justin_Jameson/lesson01/activity/.idea/vcs.xml new file mode 100644 index 0000000..4fce1d8 --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/activity/.idea/workspace.xml b/students/Justin_Jameson/lesson01/activity/.idea/workspace.xml new file mode 100644 index 0000000..2fed593 --- /dev/null +++ b/students/Justin_Jameson/lesson01/activity/.idea/workspace.xml @@ -0,0 +1,568 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + divider + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1554956370486 + + + 1554962824626 + + + 1555028299073 + + + 1555033481936 + + + 1555037422763 + + + 1555044378345 + + + 1555433176564 + + + 1555437331844 + + + 1555437485614 + + + 1555460569576 + + + 1555525315497 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson01/assignment/inventory_management/electric_appliances_class.py b/students/Justin_Jameson/lesson01/assignment/inventory_management/electric_appliances_class.py new file mode 100644 index 0000000..e3b35cd --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/inventory_management/electric_appliances_class.py @@ -0,0 +1,47 @@ +# -------------------------------------------------# +# # Title: electric appliances class module for Inventory Management +# # Dev: unknown +# # Date: 4/16/2019 +# # ChangeLog: (Who, , What) +# Justin Jameson +# added content to doc strings +# -------------------------------------------------# +""" +This files is a class for Electric appliances +""" +from inventory_class import Inventory + + +class ElectricAppliances(Inventory): + """ + This class is for appliances. + """ + def __init__(self, + product_code, + description, + market_price, + rental_price, + brand, + voltage): + + """Creates common instance variables from the parent class""" + super().__init__(product_code, + description, + market_price, + rental_price) + + self.brand = brand + self.voltage = voltage + self.output_dict = {} + + def returnasdictionary(self): + """"fixing docstring""" + # output_dict = {} + self.output_dict['product_code'] = self.product_code + self.output_dict['description'] = self.description + self.output_dict['market_price'] = self.market_price + self.output_dict['rental_price'] = self.rental_price + self.output_dict['brand'] = self.brand + self.output_dict['voltage'] = self.voltage + + return self.output_dict diff --git a/students/Justin_Jameson/lesson01/assignment/inventory_management/furniture_class.py b/students/Justin_Jameson/lesson01/assignment/inventory_management/furniture_class.py new file mode 100644 index 0000000..e3224c8 --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/inventory_management/furniture_class.py @@ -0,0 +1,43 @@ +# -------------------------------------------------# +# # Title:inventory class module for Inventory Management +# # Dev: unknown +# # Date: 4/16/2019 +# # ChangeLog: (Who, What) +# Justin Jameson +# added content to doc strings +# added super(). to get rid of duplicate code. +# -------------------------------------------------# +""" Fixing docstring """ +from inventory_class import Inventory + + +class Furniture(Inventory): + """ creating a child class of Inventory""" + def __init__(self, + product_code, + description, + market_price, + rental_price, + material, + size): + """Creates common instance variables from the parent class""" + super().__init__(product_code, + description, + market_price, + rental_price) + + self.material = material + self.size = size + self.output_dict = {} + + def return_as_dictionary(self): + """"can I get rid of the replicated ones from the original class?""" + # output_dict = {} + self.output_dict['product_code'] = self.product_code + self.output_dict['description'] = self.description + self.output_dict['market_price'] = self.market_price + self.output_dict['rental_price'] = self.rental_price + self.output_dict['material'] = self.material + self.output_dict['size'] = self.size + + return self.output_dict diff --git a/students/Justin_Jameson/lesson01/assignment/inventory_management/inventory_class.py b/students/Justin_Jameson/lesson01/assignment/inventory_management/inventory_class.py new file mode 100644 index 0000000..e9f6b65 --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/inventory_management/inventory_class.py @@ -0,0 +1,36 @@ +# -------------------------------------------------# +# # Title:inventory class module for Inventory Management +# # Dev: unknown +# # Date: 4/16/2019 +# # ChangeLog: (Who, What) +# Justin Jameson +# added content to doc strings +# -------------------------------------------------# + +""" Super class for Inventory Management program """ + + +class Inventory: + """ Inventory class defining attributes, content + is fed to this class from main.py and converted + to a dictionary. """ + def __init__(self, + product_code, + description, + market_price, + rental_price): + """ prepping input from main to place in dictionary""" + self.product_code = product_code + self.description = description + self.market_price = market_price + self.rental_price = rental_price + + def return_as_dictionary(self): + """ Fixing doc string """ + output_dict = {} + output_dict['product_code'] = self.product_code + output_dict['description'] = self.description + output_dict['market_price'] = self.market_price + output_dict['rental_price'] = self.rental_price + + return output_dict diff --git a/students/Justin_Jameson/lesson01/assignment/inventory_management/main.py b/students/Justin_Jameson/lesson01/assignment/inventory_management/main.py new file mode 100644 index 0000000..fd41ea8 --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/inventory_management/main.py @@ -0,0 +1,112 @@ +# -------------------------------------------------# +# # Title: Main module for inventory Management +# # Dev: unknown +# # Date: 4/16/2019 +# # ChangeLog: (Who, What) +# Justin Jameson +# Added doc strings +# shortened lines to conform to PEP 8 +# method 'add_new_item' removed global FULL_INVENTORY; +# added doc strings. +# #-------------------------------------------------# +""" Launches the user interface for the Inventory management system""" + +import sys +import market_prices +import inventory_class +import furniture_class +import electric_appliances_class + + +def main_menu(user_prompt=None): + """"This method is the menu for the program. The intent is to + offer (3) choices, add an item, retrieve information from an existing + item, and exit the program.""" + valid_prompts = {"1": add_new_item, + "2": item_info, + "q": exit_program} + options = list(valid_prompts.keys()) + + while user_prompt not in valid_prompts: + options_str = ("{}" + ", {}" * (len(options)-1)).format(*options) + # look at the format string with the use of f and options at the end. + print(f"Please choose from the following options ({options_str}):") + print("1. Add a new item to the Inventory") + print("2. Get item information") + print("q. Quit") + user_prompt = input(">") + return valid_prompts.get(user_prompt) + + +def get_price(item_code): + """This method is incomplete, I suspect it will + be incorporated in the future with code from below + item_price = market_prices.get_latest_price(item_code)""" + # print("Get price") + item_price = market_prices.get_latest_price(item_code) + + +def add_new_item(): + """Adding items to inventory. This method will add user + input into a dictionary""" + item_code = input("Enter item code: ") + item_description = input("Enter item description: ") + item_rental_price = input("Enter item rental price: ") + + # Get price from the market prices module + item_price = market_prices.get_latest_price(item_code) + + is_furniture = input("Is this item a piece of Furniture? (Y/N): ") + if is_furniture.lower() == "y": + item_material = input("Enter item material: ") + item_size = input("Enter item size (S,M,L,XL): ") + new_item = furniture_class.Furniture(item_code, + item_description, + item_price, + item_rental_price, + item_material, + item_size) + else: + is_electric_appliance = input("Is this item an electric appliance?" + " (Y/N): ") + if is_electric_appliance.lower() == "y": + item_brand = input("Enter item brand: ") + item_voltage = input("Enter item voltage: ") + new_item = \ + electric_appliances_class.ElectricAppliances(item_code, + item_description, + item_price, + item_rental_price, + item_brand, + item_voltage) + else: + new_item = inventory_class.Inventory(item_code, + item_description, + item_price, + item_rental_price) + FULL_INVENTORY[item_code] = new_item.return_as_dictionary() + print("New Inventory item added") + + +def item_info(): + """ This method prints the dictionary""" + item_code = input("Enter item code: ") + if item_code in FULL_INVENTORY: + print_dict = FULL_INVENTORY[item_code] + for k, value in print_dict.items(): + print("{}:{}".format(k, value)) + else: + print("Item not found in Inventory") + + +def exit_program(): + """This method exits the program""" + sys.exit() + + +if __name__ == '__main__': + FULL_INVENTORY = {} + while True: + print(FULL_INVENTORY) + main_menu()() + input("Press Enter to continue...........") diff --git a/students/Justin_Jameson/lesson01/assignment/inventory_management/market_prices.py b/students/Justin_Jameson/lesson01/assignment/inventory_management/market_prices.py new file mode 100644 index 0000000..8021a99 --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/inventory_management/market_prices.py @@ -0,0 +1,8 @@ +""" Market Prices """ + + +def get_latest_price(item_code): + """ I think this should be the magic mock? + Not sure exactly what is happening here""" + return 24 + # Raise an exception to force the user to Mock its output diff --git a/students/template_student/lesson01/assignment/pylintrc b/students/Justin_Jameson/lesson01/assignment/pylintrc similarity index 100% rename from students/template_student/lesson01/assignment/pylintrc rename to students/Justin_Jameson/lesson01/assignment/pylintrc diff --git a/students/Justin_Jameson/lesson01/assignment/test_unit.py b/students/Justin_Jameson/lesson01/assignment/test_unit.py new file mode 100644 index 0000000..a084b5b --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/test_unit.py @@ -0,0 +1,49 @@ +from unittest import TestCase +from unittest.mock import MagicMock +from unittest.mock import patch +from inventory_management import main +from inventory_class import Inventory +from furniture_class import Furniture +from electric_appliances_class import ElectricAppliances + + +class MainTest(unittest.TestCase): + """Tests for main.py: + 1. does each prompt work in 'main_menu'. + 2. when adding content to 'add_new_item', item is added to the dictionary. + 3. 'item_info' either prints the dictionary or 'Item not found in Inventory' """ + + def test_main(self): + + +class InventoryTest(unittest.TestCase): + """Tests for inventory_class + Not a test, but would like to think about, if any of the codes have a specific + format, such as numbers only. + 1. can take 4 input items and create a dictionary""" + + def test_dic_values(self): + test_dic = {'0u812': {'product_code': '0u812', 'description': 'new', 'market_price': 24, 'rental_price': '70'}} + product_code = '0u812' + description = 'new' + market_price = 24 + rental_price = 70 + self.assertEqual(test_dic, output_dict) + + +class FurnitureTest(unittest.TestCase): + """Tests for furniture_class + 1. can take 6 input items and create a dictionary""" + pass + + +class ElectricAppliancesTest(unittest.TestCase): + """Tests for electric_appliances_class + 1. can take 6 input items and create a dictionary""" + pass + + +class MarketPriceTest(unittest.TestCase): + """Test for market_prices + 1. can return a value for latest price """ + pass diff --git a/students/template_student/lesson01/assignment/tests/README.md b/students/Justin_Jameson/lesson01/assignment/tests/README.md similarity index 100% rename from students/template_student/lesson01/assignment/tests/README.md rename to students/Justin_Jameson/lesson01/assignment/tests/README.md diff --git a/students/Justin_Jameson/lesson01/assignment/tests/test_unit.py b/students/Justin_Jameson/lesson01/assignment/tests/test_unit.py new file mode 100644 index 0000000..6a8a286 --- /dev/null +++ b/students/Justin_Jameson/lesson01/assignment/tests/test_unit.py @@ -0,0 +1,23 @@ +from unittest import TestCase +from unittest.mock import MagicMock +import main.py + +"""Tests for Main.py: +1. does each prompt work in 'main_menu'. +2. when adding content to 'add_new_item', item is added to the dictionary. +3. 'item_info' either prints the dictionary or 'Item not found in Inventory' + +Tests for inventory_class +Not a test, but would like to think about, if any of the codes have a specific +format, such as numbers only. +1. can take 4 input items and create a dictionary + +Tests for furniture_class +1. can take 6 input items and create a dictionary + +Tests for electric_appliances_class +1. can take 6 input items and create a dictionary + +Test for market_prices +1. can return a value for latest price? +""" \ No newline at end of file diff --git a/students/template_student/lesson02/activity/recursive.py b/students/Justin_Jameson/lesson02/activity/recursive.py similarity index 100% rename from students/template_student/lesson02/activity/recursive.py rename to students/Justin_Jameson/lesson02/activity/recursive.py diff --git a/students/Justin_Jameson/lesson02/assignment/Justin Jameson src.zip b/students/Justin_Jameson/lesson02/assignment/Justin Jameson src.zip new file mode 100644 index 0000000..4de3e77 Binary files /dev/null and b/students/Justin_Jameson/lesson02/assignment/Justin Jameson src.zip differ diff --git a/students/template_student/lesson02/assignment/README.md b/students/Justin_Jameson/lesson02/assignment/README.md old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson02/assignment/README.md rename to students/Justin_Jameson/lesson02/assignment/README.md diff --git a/students/template_student/lesson02/assignment/extras-optional/PhyRe.py b/students/Justin_Jameson/lesson02/assignment/extras-optional/PhyRe.py old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson02/assignment/extras-optional/PhyRe.py rename to students/Justin_Jameson/lesson02/assignment/extras-optional/PhyRe.py diff --git a/students/template_student/lesson02/assignment/extras-optional/README.md b/students/Justin_Jameson/lesson02/assignment/extras-optional/README.md old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson02/assignment/extras-optional/README.md rename to students/Justin_Jameson/lesson02/assignment/extras-optional/README.md diff --git a/students/template_student/lesson02/assignment/pylintrc b/students/Justin_Jameson/lesson02/assignment/pylintrc similarity index 100% rename from students/template_student/lesson02/assignment/pylintrc rename to students/Justin_Jameson/lesson02/assignment/pylintrc diff --git a/students/Justin_Jameson/lesson02/assignment/src/charges_calc.py b/students/Justin_Jameson/lesson02/assignment/src/charges_calc.py new file mode 100644 index 0000000..fb98e23 --- /dev/null +++ b/students/Justin_Jameson/lesson02/assignment/src/charges_calc.py @@ -0,0 +1,88 @@ +# -------------------------------------------------# +# # Title: charges calculator for Inventory management. +# # Dev: unknown +# # Date: 4/17/2019 +# # ChangeLog: (Who, What) +# Justin Jameson +# correct ouput to output line 20 'ouptu JSON file' +# in source.json removed extra comma on line 5884 from +# 'units_rented': 7,, +# imported logger +# #-------------------------------------------------# + +""" Returns total price paid for individual rentals """ + +import argparse +import json +import datetime +import math +import logging +logging.basicConfig(filename='charges_calc.log', level=logging.DEBUG) +log_format = "%(asctime)s %(filename)s:%(lineno)-3d %(levelname)s %(message)s" +formatter = logging.Formatter(log_format) +file_handler = logging.FileHandler('charges_calc.log') +file_handler.setFormatter(formatter) +logger = logging.getLogger() +logger.addHandler(file_handler) + + + +def parse_cmd_arguments(): + logging.debug('called parse_cmd') + parser = argparse.ArgumentParser(description='Process some integers.') + parser.add_argument('-i', '--input', help='input JSON file', required=True) + parser.add_argument('-o', '--output', help='output JSON file', required=True) + logging.debug('about to return parser.parse_arg') + return parser.parse_args() + + +def load_rentals_file(filename): + with open(filename) as file: + try: + logging.debug('you made it to the try except block') + data = json.load(file) + except: + logging.warning('load_rentals_files threw an exception') + exit(0) + logging.debug('made it through try except about to "return data"') + return data + + +def calculate_additional_fields(data): + for value in data.values(): + logging.debug('trying to print values in data', value) + try: + logging.debug('cycling through calculate_add.. try block') + rental_start = datetime.datetime.strptime(value['rental_start'], '%m/%d/%y') + logging.debug('made it through rental_start') + rental_end = datetime.datetime.strptime(value['rental_end'], '%m/%d/%y') + logging.debug('made it through rental_end') + value['total_days'] = (rental_end - rental_start).days + logging.debug('made it through value total_days') + value['total_price'] = value['total_days'] * value['price_per_day'] + logging.debug('made it through total_price') + # value['sqrt_total_price'] = math.sqrt(value['total_price']) + # logging.debug('made it through sqrt_total_price') + value['unit_cost'] = value['total_price'] / value['units_rented'] + logging.debug('made it through calculate_add... try block', value) + except: + logging.warning('except block of calculate_add... this will exit the program without') + exit(0) + logging.debug('about to return data from calculate_add...') + return data + + +def save_to_json(filename, data): + logging.debug('made it to "save_to_json') + with open(filename, 'w') as file: + json.dump(data, file) + + +if __name__ == "__main__": + args = parse_cmd_arguments() + logging.debug('stepping into data') + data = load_rentals_file(args.input) + logging.debug('returning data, now redefining data to calculate_add...') + data = calculate_additional_fields(data) + logging.debug('returned data from calculate_add..., now stepping into save_to_json') + save_to_json(args.output, data) diff --git a/students/template_student/lesson02/assignment/src/source.json b/students/Justin_Jameson/lesson02/assignment/src/source.json old mode 100755 new mode 100644 similarity index 99% rename from students/template_student/lesson02/assignment/src/source.json rename to students/Justin_Jameson/lesson02/assignment/src/source.json index e33b77c..a092f9b --- a/students/template_student/lesson02/assignment/src/source.json +++ b/students/Justin_Jameson/lesson02/assignment/src/source.json @@ -5881,7 +5881,7 @@ }, "RNT841": { "product_code": "PRD33", - "units_rented": 7,, + "units_rented": 7, "price_per_day": 19, "rental_start": "5/11/16", "rental_end": "7/27/17" diff --git a/students/Justin_Jameson/lesson02/assignment/src/testing logger.py b/students/Justin_Jameson/lesson02/assignment/src/testing logger.py new file mode 100644 index 0000000..4179a2c --- /dev/null +++ b/students/Justin_Jameson/lesson02/assignment/src/testing logger.py @@ -0,0 +1,5 @@ +import logging +logging.basicConfig(filename='example.log',level=logging.DEBUG) +logging.debug('This message should go to the log file') +logging.info('So should this') +logging.warning('And this, too') \ No newline at end of file diff --git a/students/template_student/lesson03/activity/DatabaseDiagram.jpeg b/students/Justin_Jameson/lesson03/activity/DatabaseDiagram.jpeg old mode 100755 new mode 100644 similarity index 100% rename from students/template_student/lesson03/activity/DatabaseDiagram.jpeg rename to students/Justin_Jameson/lesson03/activity/DatabaseDiagram.jpeg diff --git a/students/template_student/lesson03/activity/create_personjob.py b/students/Justin_Jameson/lesson03/activity/create_personjob.py similarity index 100% rename from students/template_student/lesson03/activity/create_personjob.py rename to students/Justin_Jameson/lesson03/activity/create_personjob.py diff --git a/students/template_student/lesson03/activity/personjob.db b/students/Justin_Jameson/lesson03/activity/personjob.db similarity index 100% rename from students/template_student/lesson03/activity/personjob.db rename to students/Justin_Jameson/lesson03/activity/personjob.db diff --git a/students/template_student/lesson03/activity/personjob_learning_v1_p1.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p1.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v1_p1.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p1.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v1_p2.csv b/students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p2.csv similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v1_p2.csv rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p2.csv diff --git a/students/template_student/lesson03/activity/personjob_learning_v1_p3.txt b/students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p3.txt similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v1_p3.txt rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v1_p3.txt diff --git a/students/template_student/lesson03/activity/personjob_learning_v3_p1.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p1.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v3_p1.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p1.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v3_p2.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p2.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v3_p2.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p2.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v3_p3.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p3.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v3_p3.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v3_p3.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p1.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p1.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p1.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p1.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p2.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p2.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p2.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p2.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p3.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p3.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p3.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p3.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p4.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p4.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p4.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p4.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p5.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p5.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p5.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p5.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p6.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p6.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p6.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p6.py diff --git a/students/template_student/lesson03/activity/personjob_learning_v5_p7.py b/students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p7.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_learning_v5_p7.py rename to students/Justin_Jameson/lesson03/activity/personjob_learning_v5_p7.py diff --git a/students/template_student/lesson03/activity/personjob_model.py b/students/Justin_Jameson/lesson03/activity/personjob_model.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_model.py rename to students/Justin_Jameson/lesson03/activity/personjob_model.py diff --git a/students/template_student/lesson03/activity/personjob_modeli.py b/students/Justin_Jameson/lesson03/activity/personjob_modeli.py similarity index 100% rename from students/template_student/lesson03/activity/personjob_modeli.py rename to students/Justin_Jameson/lesson03/activity/personjob_modeli.py diff --git a/students/template_student/lesson03/activity/utilities.py b/students/Justin_Jameson/lesson03/activity/utilities.py similarity index 100% rename from students/template_student/lesson03/activity/utilities.py rename to students/Justin_Jameson/lesson03/activity/utilities.py diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/assignment.iml b/students/Justin_Jameson/lesson03/assignment/.idea/assignment.iml new file mode 100644 index 0000000..738176b --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/assignment.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/dictionaries/jjame.xml b/students/Justin_Jameson/lesson03/assignment/.idea/dictionaries/jjame.xml new file mode 100644 index 0000000..6b3b38d --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/dictionaries/jjame.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/encodings.xml b/students/Justin_Jameson/lesson03/assignment/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/misc.xml b/students/Justin_Jameson/lesson03/assignment/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/modules.xml b/students/Justin_Jameson/lesson03/assignment/.idea/modules.xml new file mode 100644 index 0000000..5c19b45 --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/terminal.xml b/students/Justin_Jameson/lesson03/assignment/.idea/terminal.xml new file mode 100644 index 0000000..63657c7 --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/terminal.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/vcs.xml b/students/Justin_Jameson/lesson03/assignment/.idea/vcs.xml new file mode 100644 index 0000000..4fce1d8 --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/students/Justin_Jameson/lesson03/assignment/.idea/workspace.xml b/students/Justin_Jameson/lesson03/assignment/.idea/workspace.xml new file mode 100644 index 0000000..f7b7231 --- /dev/null +++ b/students/Justin_Jameson/lesson03/assignment/.idea/workspace.xml @@ -0,0 +1,688 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Meta + \\ + primary_key = True, + m + output_dict + customer_class + customer_info_model + model_to_dict + query_dict + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +