From 1fd231a1a785ac9309489d5f5584f28e0e29da43 Mon Sep 17 00:00:00 2001 From: kerem Date: Tue, 17 Oct 2023 15:59:00 +0200 Subject: [PATCH] Finihsed with Products database and admin --- webinterface/$ | 269 ++++++++++++ .../admin/__pycache__/forms.cpython-311.pyc | Bin 6352 -> 11558 bytes .../admin/__pycache__/routes.cpython-311.pyc | Bin 8688 -> 19089 bytes .../admin/__pycache__/utils.cpython-311.pyc | Bin 177 -> 576 bytes webinterface/minibase/admin/forms.py | 142 +++++-- webinterface/minibase/admin/routes.py | 389 ++++++++++++++---- webinterface/minibase/admin/utils.py | 5 + .../__pycache__/models.cpython-311.pyc | Bin 35190 -> 38459 bytes .../__pycache__/utils.cpython-311.pyc | Bin 5632 -> 14151 bytes webinterface/minibase/database/company.csv | 5 + .../database/company_legal_entity.csv | 9 + .../minibase/database/company_relation.csv | 5 + .../minibase/database/company_status.csv | 5 + webinterface/minibase/database/industry.csv | 8 + webinterface/minibase/database/models.py | 93 +++-- .../minibase/database/note_status.csv | 5 + webinterface/minibase/database/person.csv | 3 + .../minibase/database/person_competence.csv | 6 + .../minibase/database/person_role.csv | 12 + webinterface/minibase/database/product.csv | 3 + .../minibase/database/product_category.csv | 10 + .../database/product_classification.csv | 6 + .../minibase/database/product_domain.csv | 8 + .../minibase/database/product_eligibility.csv | 5 + .../minibase/database/product_packaging.csv | 7 + .../minibase/database/product_physical.csv | 8 + .../minibase/database/product_status.csv | 11 + .../database/product_sub_category.csv | 12 + webinterface/minibase/database/project.csv | 3 + .../minibase/database/project_element.csv | 3 + .../minibase/database/project_status.csv | 8 + webinterface/minibase/database/utils.py | 171 +++++++- webinterface/minibase/product/forms.py | 1 + webinterface/minibase/product/routes.py | 0 webinterface/minibase/project/routes.py | 37 ++ webinterface/minibase/site.db | Bin 290816 -> 290816 bytes .../minibase/static/pics/default_product.jpg | Bin 0 -> 10994 bytes .../admin/company_register_industry.html | 65 --- .../admin/company_register_legal_entity.html | 65 --- .../admin/company_register_relation.html | 67 --- .../admin/person_register_competence.html | 65 --- .../templates/admin/person_register_role.html | 86 ---- ...ister.html => register_name_and_desc.html} | 6 +- webinterface/minibase/templates/layout.html | 19 +- webinterface/prepare.py | 233 ++--------- 45 files changed, 1169 insertions(+), 686 deletions(-) create mode 100644 webinterface/$ create mode 100644 webinterface/minibase/database/company.csv create mode 100644 webinterface/minibase/database/company_legal_entity.csv create mode 100644 webinterface/minibase/database/company_relation.csv create mode 100644 webinterface/minibase/database/company_status.csv create mode 100644 webinterface/minibase/database/industry.csv create mode 100644 webinterface/minibase/database/note_status.csv create mode 100644 webinterface/minibase/database/person.csv create mode 100644 webinterface/minibase/database/person_competence.csv create mode 100644 webinterface/minibase/database/person_role.csv create mode 100644 webinterface/minibase/database/product.csv create mode 100644 webinterface/minibase/database/product_category.csv create mode 100644 webinterface/minibase/database/product_classification.csv create mode 100644 webinterface/minibase/database/product_domain.csv create mode 100644 webinterface/minibase/database/product_eligibility.csv create mode 100644 webinterface/minibase/database/product_packaging.csv create mode 100644 webinterface/minibase/database/product_physical.csv create mode 100644 webinterface/minibase/database/product_status.csv create mode 100644 webinterface/minibase/database/product_sub_category.csv create mode 100644 webinterface/minibase/database/project.csv create mode 100644 webinterface/minibase/database/project_element.csv create mode 100644 webinterface/minibase/database/project_status.csv create mode 100644 webinterface/minibase/product/forms.py create mode 100644 webinterface/minibase/product/routes.py create mode 100644 webinterface/minibase/static/pics/default_product.jpg delete mode 100644 webinterface/minibase/templates/admin/company_register_industry.html delete mode 100644 webinterface/minibase/templates/admin/company_register_legal_entity.html delete mode 100644 webinterface/minibase/templates/admin/company_register_relation.html delete mode 100644 webinterface/minibase/templates/admin/person_register_competence.html delete mode 100644 webinterface/minibase/templates/admin/person_register_role.html rename webinterface/minibase/templates/admin/{status_register.html => register_name_and_desc.html} (93%) diff --git a/webinterface/$ b/webinterface/$ new file mode 100644 index 00000000..834e0dc8 --- /dev/null +++ b/webinterface/$ @@ -0,0 +1,269 @@ +from minibase.database.models import Company, Company_relation, Company_legal_entity +from minibase.database.models import Industry, Countries +from minibase.database.models import Person, Person_role, Person_competence +from minibase.database.models import Project, Project_element +from minibase import db +from numpy import genfromtxt + + +# Gets the id of company from the formated output defined at models.py for the Company Model +# The argument formatedCompanySelection is formated by SQLAlchemy in models.py files +# Please look there before changing anything here. +def getCompanyId(formatedCompanySelection): + text = formatedCompanySelection.split(",") + return text[2] # Corresponds to the ID of the Company + + +# Gets the id of Person's role +def getPersonRoleId(nameForId): + selection = Person_role.query.filter_by(name=nameForId).first() + return selection.id + + +# Gets the id of Person's competence +def getPersonCompetenceId(nameForId): + selection = Person_competence.query.filter_by(name=nameForId).first() + return selection.id + + +# Gets the country of the company based on it's id +def getCompanyCountry(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.country_bill + + +# Gets the state of the company based on it's id +def getCompanyState(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.street_bill + + +# Gets the city of the company based on it's id +def getCompanyCity(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.city_bill + + +# Gets the Postal Code of the company based on it's id +def getCompanyPostCode(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.post_code_bill + + +# Gets the Name of the street of the company based on it's id +def getCompanyStreetName(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.street_bill + + +# Gets the Number of the street of the company based on it's id +def getCompanyStreetNo(companyId): + selection = Company.query.filter_by(id=companyId).first() + return selection.street_no_bill + + +# Returns the query of all awailable companie names on the table named Company +# Note that the formating is done during the SQLAlchemy Table declaration. +def person_role_choices(): + choices = Person_role.query.all() + return choices + + +# Returns the query of all awailable companie names on the table named Company +# Note that the formating is done during the SQLAlchemy Table declaration. +def person_competence_choices(): + choices = Person_competence.query.all() + return choices + + +# Returns the query of all awailable companie names on the table named Company +# Note that the formating is done during the SQLAlchemy Table declaration. +def company_choices(): + choices = Company.query.all() + return choices + + +# Retunrs the qurry of all awailable industrie names on the table named Industry +# Note that the formating is done during the SQLAlchemy Table declaration. +def company_industry_choices(): + choices = Industry.query.all() + return choices + + +# Retunrs the query of all awailable legal entity names on the table named Company_legal_entity +# Note that the formating is done during the SQLAlchemy Table declaration. +def company_legal_entity_choices(): + choices = Company_legal_entity.query.all() + return choices + + +# Retunrs the query of all awailable Relation names on the table named Company_relation +# Note that the formating is done during the SQLAlchemy Table declaration. +def company_relation_choices(): + choices = Company_relation.query.all() + return choices + + +# The Company Model has Industry Column as a foreign key and it requires the Industry's ID +# And not the name. so this function returns the right ID of the name shown at the +# Register Company Form +def getIndustryId(nameForId): + selection = Industry.query.filter_by(name=nameForId).first() # Gets the id of Role + return selection.id + + +# The Company Model has Relation Column as a foreign key and it requires the Industry's ID +# And not the name. so this function returns the right ID of the name shown at the +# Register Company Form +def getRelationId(nameForId): + selection = Company_relation.query.filter_by(name=nameForId).first() # Gets the id of Role + return selection.id + + +# The Company Model has Legal Entity Column as a foreign key and it requires the Industry's ID +# And not the name. so this function returns the right ID of the name shown at the +# Register Company Form +def getLegalEntityId(nameForId): + selection = Company_legal_entity.query.filter_by(name=nameForId).first() # Gets the id of Role + return selection.id + + +# Retunrs the query of all awailable Country names on the table named Countries +# Note that the formating is done during the SQLAlchemy Table declaration. +# Important note This table is ImporteD externally from a modifier SQL version of +# Github : https://github.com/dr5hn/countries-states-cities-database +def country_choices(): + choices = Countries.query.all() + return choices + +################################################################################################### +# CSV manipulation +################################################################################################### + +def openCsv(filename): + data = genfromtxt(filename, + delimiter=',', + skip_header=1, + dtype=None, + encoding='UTF-8') + return data.tolist() + + +def db_add_name_and_description(csv, table): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = table(**{ + 'name': i[0], + 'description': i[1]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except: + db.session.rollback() # Rollback the changes on error + print("Error Ocured during <> upload to DB") + + +def db_add_company(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Company(**{ + 'name': i[0], + 'legal_entity_id': i[1], + 'relation_id': i[2], + 'industry_id': i[3], + 'status_id': i[4], + 'website': i[5], + 'street_bill': i[6], + 'street_no_bill': i[7], + 'city_bill': i[8], + 'post_code_bill': i[9], + 'state_bill': i[10], + 'country_bill': i[11], + 'street_ship': i[12], + 'street_no_ship': i[13], + 'city_ship': i[14], + 'post_code_ship': i[15], + 'state_ship': i[16], + 'country_ship': i[17]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_person(csv): + try: + csv_list = openCsv(csv) + print(csv_list) + for i in csv_list: + record = Person(**{ + 'name': i[0], + 'last_name': i[1], + 'company_id': i[2], + 'role_id': i[3], + 'competence_id': i[4], + 'mail_prof': i[5], + 'mail_priv': i[6], + 'tel_prof_mobile': i[7], + 'street_name': i[8], + 'street_no': i[9], + 'city': i[10], + 'post_code': i[11], + 'state': i[12], + 'country': i[13] + }) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_project(csv): + try: + csv_list = openCsv(csv) + print(csv_list) + for i in csv_list: + record = Project(**{ + 'name': i[0], + 'description': i[1], + 'company_id': i[2], + 'status_id': i[3], + 'industry_id': i[4], + 'owner_id': i[5], + 'qte_prototype': i[6], + 'qte_start': i[7], + 'qte_production': i[8], + }) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) + +def db_add_project_element(csv): + try: + csv_list = openCsv(csv) + print(csv_list) + for i in csv_list: + record = Project_element(**{ + 'name': i[0], + 'description': i[1], + 'qte_per_project': i[2], + 'project_id': i[3], + 'owner_id': i[4], + 'status_id': i[5], + }) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) diff --git a/webinterface/minibase/admin/__pycache__/forms.cpython-311.pyc b/webinterface/minibase/admin/__pycache__/forms.cpython-311.pyc index 423654a0d039d321a5797b8e9f99d2244ff2f90b..fb85d01f128907cd4eb6b4d6881a42ec18e766f4 100644 GIT binary patch literal 11558 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 diff --git a/webinterface/minibase/admin/__pycache__/routes.cpython-311.pyc b/webinterface/minibase/admin/__pycache__/routes.cpython-311.pyc index 13f51ee3c8071b5e4f3bafad989f329eced49266..8214fbc81939b321a50e1369e3bec70bd616ca13 100644 GIT binary patch literal 19089 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 literal 8688 zcmeI1&2JmW6~LDiKSmawU#Z)7HmnjBuBPnTlFVw*NB+|L2Fkw9WJTP zQVFEWjZhS*Q5dNY0a~CJqi7rjb^smyKlHLotii&R?@nc zM8xiB=Iy*Uv!j{czIpRyYikPwzrTJRp z6IP)q(InUsHo=~-3yy@tLY`YQP5~tl%{OJ5g_cAM&D%0A!JTjmt%+8_lkiZP9c12w zm*yRi_a%ISKjEikXC@#VNE{H_5^X{-5fs`J?LtSQL+DI&S{N(CJ2=F5J%L_5gat>?uH7DkOvC4~it@(6jm0!W>Y@W4fR_->Wt@*pWz+Xyd z)3;M1&o*h!GdW=;m0i=?N||Jazmv)&`D{L&U(23DvqDW@1Ix7B zrk6>FbmLSS5c8@0s(6jRlNR$lrZRhq6VloBzBp+G-YtnsPtEVvbZ+5>X1jXj`VDv~ zr@-g$<~VVwJgXt&gu4muR}Q+8^Onj(^9s1nmkMSr{4ihDj}7Ktxy^gz4e1Z0$jDcu&n)J(f8Ux97`5O% zDFaFQv8y7jBX?dKl{}&pp^YT|#&6Z6GyyoI~aS5ka$hue$lZgqFEllTnSfA`+W9ISPfaVle zmzH=@Tpy9^lo0rtoIu8x~_HBrrBYY!piehE!s3Mf|x9G&9)4SjrCzai~=Tu ztl5DKcuhk&Oki?*4U-|$no{DD7Wg=oNppafB&=s~^|p}CYc?pSFd0PLOe#7>=s&zI zXmFh7fb|8nFd0xxW*87aZUyPfim@h9K59jZ*5*yovxy@ui)&Hongfp-ep?t zBRd@Tf{WG9=816^E=O@4H*q8Xi!3f zJE-MhOA&PyP?wBC3JOUm^bKm2{Ns}6*!G%?<`gt1p}8GzpVYsoMi@i;suO_$LVl3l%us~6DY3oE{8(HAfH;xESD zSH>2KV~d5cMS1LkGIl}sT~vG*Hy7)or~6dOnp=OhGXT#Tud~ zE_se@PswOTK{FDXq3BsqqjT!P@jcNqr$%N7ccP8ZgX1s&_0W?pd5!z%0ne%IckO#v zHRy4c&=WGyv#4)3zCU@4sn&=*#y-O!PfJMwT&F7Z`0xRk%Gg7acM6$fV6hAtqc3|w z#&{<@0orqLi?1Oe{!IlkesEBV{^5du`0LJRy+!s!fjuF!(+WE+`)3sY%;wMP6DIPm z2{S5r#SVS;geKUmq^kv-@>Tz))osqs?w+P*pW z)+qZm9eS)HOu`GbVCmOgntC%#XG&Yyo6+si07$j7qS?uG6sZ%l{$_33D(uVJU86WAt6-hl3gLi6$01A-J!U9i|%N_9sS~$ zN^GJSJ6VXGlw&hWY({p^D(>0Mg}Ph`hU;*pop>(o#B*tnKWM4;T-Ie2QBXuek%pej zLCJGyD=ni*1x-q5l5*vJH9Ae85*>N_rfFJ@OcJO>VhuJ;I#)t9Tp|9R9&y^I%a4aH zKRh^8Lzl+8rrr`=hzFxjom$2W)n`m)w&|qleuFeL5>$$=mNrhVicYovqCeFgni*Kt zltn;|W>2^NxWb-F&+#eHUxi!zHzb5W{jzI7aSZ^00`DmS zwiq~C2poMeKCg@~7RN6Y#xKd^SCsK9a^R{GxVm|vE`mab>L93xAgG5Rs3$I=&MF2; z9WfaVD`;3k!wn%cCV7r-FUn|EL9-H?r4Tx+Mo+7UCiZl0POFhw0-@pYw?fDl*TdT7 zf!Zg}PnkS>vkJn}dc3CnGXF{VIz1DqMNYSloHyo{&KYl+GrG31H$r;tH+DwtWU)K+ zn(r1PWNV{&^hS*?nIYoUAC}h!o(GlB;1>S@2_Z+X?CMus{Xh*cl?2;iW!f7C8MZFr}PU! z|Jh$L)K{bNxbM(3bZs@m&*Dps zc>B}MkZd`pSkCQQ+bwW(0LjZH#(LgT79A~Xu-gmIk8htM8fO&C8MDSbXp}_%i^kyA z>h|(hjGwnY&1ndF; diff --git a/webinterface/minibase/admin/__pycache__/utils.cpython-311.pyc b/webinterface/minibase/admin/__pycache__/utils.cpython-311.pyc index e54c266205607436ded05e8c07be90f98b869e20..8d9728b63c1193a8d8ea79bea88cde360c88d19c 100644 GIT binary patch literal 576 zcmZWlzfZzI6uv7h8uS#6i;HyaLUo2X;IECvO{YQ+J#9hnN|Xc>1_uY7T{{?!adGf( zaEFl4-0H+e!p7vgYB7c{dEdMD-Fx4?+zTNY1UP=k(@)4>sz`u;5938RJR%p}q9f$u zLu6@HEop*mK%^kXA*0`qjb~V^NRURs{p}M!y(zt9=-jeAW^8(7HUUz&d4d$_PDs|Th9BI@T7lDnY(=;aq`?TRx`<%Ay6BgJ$tFwwDsC`8%tPaLCr%L}+$At#F z88A=eFIqC|HmE4W!+Wvm4&zH;tG-Aa0CiAAR_~7oB-bOk(0IxW%*~#;`M&nC-Zcw- zv(P2QJ}C}JsYgm(vfC%So&9Kzj1V?fqUG$}Wwfw(w>1VURJL$z{)+fAl$-!f=8JyA bZF+Q@uRy7OM{EF%QW)cru48bTrFi}uym@)x delta 116 zcmX@WvXPN@IWI340}#l6RY_%>$SWz$2INdTZlX-=wL5i3v~BM=w!1BnmJjEsyQ7+^#ZGf)fw DQ{WoN diff --git a/webinterface/minibase/admin/forms.py b/webinterface/minibase/admin/forms.py index 912edc7b..7fdd3e58 100644 --- a/webinterface/minibase/admin/forms.py +++ b/webinterface/minibase/admin/forms.py @@ -1,12 +1,15 @@ from flask_wtf import FlaskForm from wtforms import StringField, SubmitField from wtforms.validators import DataRequired, ValidationError -from minibase.database.models import Person_role -from minibase.database.models import Company_legal_entity, Company_relation -from minibase.database.models import Industry +from minibase.database.models import Person_role, Person_competence +from minibase.database.models import Company_legal_entity, Company_relation, Company_status +from minibase.database.models import Industry, Note_status +from minibase.database.models import Project_status +from minibase.database.models import Product_status, Product_physical, Product_packaging, Product_eligibility, Product_classification, Product_domain, Product_category, Product_sub_category +import minibase.admin.utils as adminUtils -class compIndustryForm(FlaskForm): # Defines the form class to be used for the user registretion +class industryRegisterForm(FlaskForm): # Defines the form class to be used for the user registretion # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) @@ -14,8 +17,7 @@ class compIndustryForm(FlaskForm): # Defines the form class to be used for the # Queries to be made in order to validate the form : If Relation Type exitst # Case Insensistive def validate_name(self, name): - industry_query = Industry.query.filter(Industry.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if industry_query: + if adminUtils.doesNameExistsCi(Product_status, name.data): raise ValidationError('That Industry Type is already registered') @@ -23,38 +25,46 @@ class compRelationForm(FlaskForm): # Defines the form class to be used for the # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) - submit = SubmitField('Register Relation') + submit = SubmitField('Register Company Relation') # Queries to be made in order to validate the form : If Relation Type exitst # Case Insensistive def validate_name(self, name): - relation_query = Company_relation.query.filter(Company_relation.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if relation_query: - raise ValidationError('That Relation Type is already registered') + if adminUtils.doesNameExistsCi(Company_relation, name.data): + raise ValidationError('That Company Relation Type is already registered') class compLegalEntityForm(FlaskForm): # Defines the form class to be used for the user registretion # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) - submit = SubmitField('Register Legal Entity') + submit = SubmitField('Register Company Legal Entity') # Queries to be made in order to validate the form : If Legal Entity exitst # Case Insensistive def validate_name(self, name): - legal_entity_query = Company_legal_entity.query.filter(Company_legal_entity.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if legal_entity_query: - raise ValidationError('That Legal Entity is already registered') + if adminUtils.doesNameExistsCi(Company_legal_entity, name.data): + raise ValidationError('That Company Legal Entity is already registered') + +class compStatusForm(FlaskForm): # Defines the form class to be used for the user registretion + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Company Status') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Company_status, name.data): + raise ValidationError('That Company Status is already registered') class personRoleForm(FlaskForm): # Defines the form class to be used for the user registretion # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) - submit = SubmitField('Register Role') + submit = SubmitField('Register Person Role') # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive def validate_name(self, name): - person_role_query = Person_role.query.filter(Person_role.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if person_role_query: + if adminUtils.doesNameExistsCi(Person_role, name.data): raise ValidationError('That Person Role is already registered') @@ -62,23 +72,105 @@ class personCompetenceForm(FlaskForm): # Defines the form class to be used for # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) - submit = SubmitField('Register Role') + submit = SubmitField('Register Person Competence') # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive def validate_name(self, name): - person_competence_query = Person_role.query.filter(Person_role.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if person_competence_query: + if adminUtils.doesNameExistsCi(Person_competence, name.data): raise ValidationError('That Person Conpetence is already registered') -class statusRegisterForm(FlaskForm): # Defines the form class to be used for the user registretion +class noteStatusForm(FlaskForm): # Defines the form class to be used for the user registretion + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Note Status') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Note_status, name.data): + raise ValidationError('That Note Status is already registered') + + +class projectStatusForm(FlaskForm): # Defines the form class to be used for the user registretion + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Project Status') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Project_status, name.data): + raise ValidationError('That Project Status is already registered') + + +class productStatusForm(FlaskForm): + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Product Status') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Product_status, name.data): + raise ValidationError('That Product Status is already registered') + + +class productEligibilityForm(FlaskForm): + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Product Eligibility') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Product_eligibility, name.data): + raise ValidationError('That Product Eligibility is already registered') + + +class productDomainForm(FlaskForm): + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Product Domain') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Product_domain, name.data): + raise ValidationError('That Product domain is already registered') + + +class productClassificationForm(FlaskForm): + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Prodcut Classification') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Product_classification, name.data): + raise ValidationError('That Product Classification is already registered') + + +class productCategoryForm(FlaskForm): + # Decalarion of the fields for the form and it's propereties + name = StringField('Name', validators=[DataRequired()]) + description = StringField('Description', validators=[DataRequired()]) + submit = SubmitField('Register Product Category') + + # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive + def validate_name(self, name): + if adminUtils.doesNameExistsCi(Product_category, name.data): + raise ValidationError('That Product Category is already registered') + + +class productSubCategoryForm(FlaskForm): # Decalarion of the fields for the form and it's propereties name = StringField('Name', validators=[DataRequired()]) description = StringField('Description', validators=[DataRequired()]) - submit = SubmitField('Register Status') + submit = SubmitField('Register Product Sub Category') # Queries to be made in order to validate the form : If Person Role exitst # Case Insensistive def validate_name(self, name): - person_competence_query = Status.query.filter(Status.name.ilike(name.data)).first() # Database Querry ilike means case insessitive - if person_competence_query: - raise ValidationError('That Status is already registered') + if adminUtils.doesNameExistsCi(Product_sub_category, name.data): + raise ValidationError('That Product Sub Category is already registered') diff --git a/webinterface/minibase/admin/routes.py b/webinterface/minibase/admin/routes.py index e2dc41fc..dd879c6d 100644 --- a/webinterface/minibase/admin/routes.py +++ b/webinterface/minibase/admin/routes.py @@ -1,165 +1,414 @@ from flask import render_template, url_for, flash, redirect, request, Blueprint from minibase import db from minibase.config import themeMinibase -from minibase.database.models import Company, Company_legal_entity, Company_relation -from minibase.database.models import Industry +from minibase.database.models import Company, Company_legal_entity, Company_relation,Company_status +from minibase.database.models import Industry, Note_status from minibase.database.models import Person_role, Person_competence -from minibase.admin.forms import compLegalEntityForm, compRelationForm, compIndustryForm,personRoleForm, personCompetenceForm, statusRegisterForm - +from minibase.database.models import Product_status, Product_physical, Product_packaging, Product_eligibility, Product_classification, Product_domain, Product_category, Product_sub_category +from minibase.admin.forms import compLegalEntityForm, compRelationForm, compStatusForm +from minibase.admin.forms import personRoleForm, personCompetenceForm +from minibase.admin.forms import industryRegisterForm, noteStatusForm +from minibase.admin.forms import projectStatusForm +from minibase.admin.forms import productStatusForm, productEligibilityForm, productDomainForm, productClassificationForm, productCategoryForm, productSubCategoryForm # Declaring a blueprint admin = Blueprint('admin', __name__) @admin.route("/company_register_legal_entity", methods=['GET', 'POST']) def company_register_legal_entity(): + toPrint = "Company Legal Entity" form = compLegalEntityForm() - legal_entities = Company_legal_entity.query.order_by(Company_legal_entity.name.asc()) + query = Company_legal_entity.query.order_by(Company_legal_entity.name.asc()) if form.validate_on_submit(): - companyLegal = Company_legal_entity( + dbRow = Company_legal_entity( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(companyLegal) + db.session.add(dbRow) db.session.commit() - flash(f'{"Company Legal Entity registered!"}', 'success') - return render_template('admin/company_register_legal_entity.html', - title='Register Company Legal Entity', - legal_entities=legal_entities, + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) - return render_template('admin/company_register_legal_entity.html', - title='Register Company Legal Entity', - legal_entities=legal_entities, + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) @admin.route("/company_register_relation", methods=['GET', 'POST']) def company_register_relation(): + toPrint = "Company Relation" form = compRelationForm() - relations = Company_relation.query.order_by(Company_relation.name.asc()) + query = Company_relation.query.order_by(Company_relation.name.asc()) if form.validate_on_submit(): - companyRelation = Company_relation( + dbRow = Company_relation( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(companyRelation) + db.session.add(dbRow) db.session.commit() - flash(f'{"Company Relation registered!"}', 'success') - return render_template('admin/company_register_relation.html', - title='Register Company Relation', - relations=relations, + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) - return render_template('admin/company_register_relation.html', - title='Register Company Relation', + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, - relations=relations, form=form) -@admin.route("/company_register_industry", methods=['GET', 'POST']) -def company_register_industry(): - form = compIndustryForm() - industries = Industry.query.order_by(Industry.name.asc()) +@admin.route("/company_register_status", methods=['GET', 'POST']) +def company_register_status(): + toPrint = "Company Status" + form = compStatusForm() + query = Company_status.query.order_by(Company_status.name.asc()) if form.validate_on_submit(): - companyIndustry = Industry( + dbRow = Company_status( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(companyIndustry) + db.session.add(dbRow) db.session.commit() - flash(f'{"Company Idustry registered!"}', 'success') - return render_template('admin/company_register_industry.html', - title='Register Company Industry', - industries=industries, + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) - return render_template('admin/company_register_industry.html', - title='Register Company Industry', - industries=industries, + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + + +@admin.route("/register_industry", methods=['GET', 'POST']) +def register_industry(): + toPrint = "Company Industry" + form = industryRegisterForm() + query = Industry.query.order_by(Industry.name.asc()) + if form.validate_on_submit(): + dbRow = Industry( + name=form.name.data, + description=form.description.data) + # Here we need to give the id of thr role as this is a foreign key + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) @admin.route("/person_register_role", methods=['GET', 'POST']) def person_register_role(): + toPrint = "Person Role" form = personRoleForm() - roles = Person_role.query.order_by(Person_role.name.asc()) + query = Person_role.query.order_by(Person_role.name.asc()) if form.validate_on_submit(): - personRole = Person_role( + dbRow = Person_role( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(personRole) + db.session.add(dbRow) db.session.commit() - flash(f'{"Person Role registered!"}', 'success') - return render_template('admin/person_register_role.html', - title='Register Person_role', + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, - roles=roles, form=form) - return render_template('admin/person_register_role.html', - title='Register Person Role', + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, - roles=roles, form=form) @admin.route("/person_register_competence", methods=['GET', 'POST']) def person_register_competence(): + toPrint = "Person Competence" form = personCompetenceForm() - competences = Person_competence.query.order_by(Person_competence.name.asc()) + query = Person_competence.query.order_by(Person_competence.name.asc()) if form.validate_on_submit(): - personCompetence = Person_competence( + dbRow = Person_competence( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(personCompetence) + db.session.add(dbRow) db.session.commit() - flash(f'{"Person Competence registered!"}', 'success') - return render_template('admin/person_register_competence.html', - title='Register Person Competence', - competences=competences, + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) - return render_template('admin/person_register_competence.html', - title='Register Person Competence', + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, - competences=competences, form=form) -@admin.route("/status_register", methods=['GET', 'POST']) -def status_register(): - form = statusRegisterForm() - statuses = Status.query.order_by(Status.name.asc()) + +@admin.route("/note_register_status", methods=['GET', 'POST']) +def note_register_status(): + toPrint = "Note Status" + form = noteStatusForm() + query = Note_status.query.order_by(Note_status.name.asc()) if form.validate_on_submit(): - statusRegister = Status( + dbRow = Company_status( name=form.name.data, description=form.description.data) # Here we need to give the id of thr role as this is a foreign key - db.session.add(statusRegister) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/project_register_status", methods=['GET', 'POST']) +def project_register_status(): + toPrint = "Project Status" + form = projectStatusForm() + query = Project_status.query.order_by(Project_status.name.asc()) + if form.validate_on_submit(): + dbRow = Project_status( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_status", methods=['GET', 'POST']) +def product_register_status(): + toPrint = "Product Status" + form = productStatusForm() + query = Product_status.query.order_by(Product_status.name.asc()) + if form.validate_on_submit(): + dbRow = Product_status( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_eligibility", methods=['GET', 'POST']) +def product_register_eligibility(): + toPrint = "Product Eligibility" + form = productEligibilityForm() + query = Product_eligibility.query.order_by(Product_eligibility.name.asc()) + if form.validate_on_submit(): + dbRow = Product_eligibility( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_domain", methods=['GET', 'POST']) +def product_register_domain(): + toPrint = "Product Domain" + form = productEligibilityForm() + query = Product_domain.query.order_by(Product_domain.name.asc()) + if form.validate_on_submit(): + dbRow = Product_domain( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_classification", methods=['GET', 'POST']) +def product_register_classification(): + toPrint = "Product Classification" + form = productEligibilityForm() + query = Product_classification.query.order_by(Product_classification.name.asc()) + if form.validate_on_submit(): + dbRow = Product_classification( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_category", methods=['GET', 'POST']) +def product_register_category(): + toPrint = "Product Category" + form = productEligibilityForm() + query = Product_category.query.order_by(Product_category.name.asc()) + if form.validate_on_submit(): + dbRow = Product_category( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) + db.session.commit() + + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, + theme=themeMinibase, + form=form) + + +@admin.route("/product_register_sub_category", methods=['GET', 'POST']) +def product_register_sub_category(): + toPrint = "Product Sub Category" + form = productEligibilityForm() + query = Product_sub_category.query.order_by(Product_sub_category.name.asc()) + if form.validate_on_submit(): + dbRow = Product_sub_category( + name=form.name.data, + description=form.description.data) + db.session.add(dbRow) db.session.commit() - flash(f'{"New Status registered!"}', 'success') - return render_template('admin/status_register.html', - title='Register Status', - statuses=statuses, + flash(f' {toPrint} {" registered!"}', 'success') + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) - return render_template('admin/status_register.html', - title='Register Status', - statuses=statuses, + return render_template('admin/register_name_and_desc.html', + title='Register ' + toPrint, + tableTitle='Existing ' + toPrint, + dbTable=query, theme=themeMinibase, form=form) diff --git a/webinterface/minibase/admin/utils.py b/webinterface/minibase/admin/utils.py index 8b137891..8dec0b43 100644 --- a/webinterface/minibase/admin/utils.py +++ b/webinterface/minibase/admin/utils.py @@ -1 +1,6 @@ +def doesNameExistsCi(table, name): + exists = table.query.filter(table.name.ilike(name.data)).first() # Database Querry ilike means case insessitive + if exists: + return 1 + return 0 diff --git a/webinterface/minibase/database/__pycache__/models.cpython-311.pyc b/webinterface/minibase/database/__pycache__/models.cpython-311.pyc index 929751e54803c05a4cab2193aefb8e28752fd88f..c3e87c67fc3a20d9e138c63d96587ac7ff272ece 100644 GIT binary patch delta 3307 zcmb7GeN0=|759CF58K$!AJ~`=17;<`1XI4!fD=elC4~eB0%YJc#IEsk!GsUz*(8Of z!L(6|v`R~QqKzf2BU-v3g=#^Twy4z>)M--JblbCPb&O6++No7nDGE_DChd=P_grHj zNz-Ky-p}uxd+zzV=iGajU+3PL<Ca!P8T(Oj-;A9OlVaq9* z@D!Aj9Ay!sw^F)>(Hj|EOKCf!H!*q}rMDxUS}fGH%dGX0|0EUEa|9cYlg%*KYlHK9kB|=`rRig6 zJf08BO=>a++U&;2KF7AC>;*n=LVRs(a^z~+d`RLQQQi^b9pT0$HEcgI-47AUdnF$@~!eJeSX7M(D?n=<22EXnkz({8w zgI^!8kvkAoWkn9weMR739dD)BP|NS&#`u%)mrhrzg_1!%0gK%f>2OvglMi6x@F~&+ zD%ZQ@bC6tHQmRly1)m(viag=|O%hzSZGgN=HT-xN4=vst$n%~c%W%P)O>V$1z4_#y z5I)udMM4%i1UrP2;`Uzn+wl&#?XTgI3GA#haZjYKtbPmJG#A1zzMBiR79G5y z%Y*V14Sb+0XTRzCa+tO~O~19UWY)qPdOnwy2xg8w0`Y14FuClRO@p(CED-Kbhiw)O z4EE=--*iJho1%El!JJ_e+_GswrPIQ{4Y^7pklD1Av3z3=Ja1LN z+Zj6OFh03KP*D5%gO>b9dbcw155}CFN626_P?wnnn;J@>&#Qq?yLFI0Q~);{6!6qg zoYrLO;7peqc|;8#c3VK%SOPz3h>xDmBva%10L@Y zPmh1Frwj@LnQ7t_^`_Zcf^A-~s2UOlpGXJY-XZ!iNXHh_x`#(784QVkhhSh1s*c*q zd8#ci6!Z!10gp(PE$UX(`-cXp?C@Yn91&l_U{4}6!`Y*mWAb>IZojaoOhkbMzdkI= z5Py$m)$0O4sq|IHnSwy?NYL-~^fLwP_b*iNz@8zY50ac>02}OWx^)!;r_#e2r;_Y~ zx}XK*;$}$CQNj+`{|FX0nG{7P1N_byHc>wbPZCYG>Lm)?KQ*R{fq%%5p@r9I-4q)d-|`N6D?# z`6V+0Gu^WT()P}1nKM@Al)OEXsW)osjhTAU5NJX<>7A0s8Pzyr8fSP9yw{vteMr)E zMRi>f)Xh}R)=9Ok(amkK&27@*Zpq+{8oV)sH{5&+Jk;!AN$-m4T`|2Y>_D^i z-)i<+X|%KJAiCX`(bl>nrx57}%BKi<2tTDqPCxphx@wyjB)%!iH^ulS7(Z#@ zisGJuYosh5;ivHkTjBGOf~v@4n6aV^!WH@ke@IV(9%`$Gv&J>^>O>szHiDytndvOz zloduiooV}4c9TSi*B`@nDas)H3O~MsfTsjyv3zSZ3EL}u3*+r3H8Y-;=w!?_Tp5?| zNHA7&d;`_}j~thy48m{Ma$GWBE%A*}zA?r(vK*Jky~)T(c(ZQfK#z3Hqx5xLRsjz4 zH^{G*z@Hz(y=s&}_|uwu>n}UZy=nsUb`zuQHG71>Xyv;r@_25bvC_zCcg>V4_Ynj~~}A zqqVhFvSv`HszCm7)%{M@qZq#uB0MP9Sj3eqcYHn1xmyQz(1JZBNu z^$0IHBCZnaZ`M?-p^=DaTQH%93bIPoA&?)p^7Tlj4kxqrV(o#~tBzqVpx?k(P zi~M_QgRaPlSLI}^fE*-CvTw%tG#tCPUgB9ICwWV(&b!FJw>D^cSd2}bESxH) zvg-SV;j@X-u}94Kf3%+w&%OBAo>WfNtd|A#>0ARn#M17{l;|CWB?h@*n=r|lW^@}W KCiKZ{EBG(>V(;Ss delta 2262 zcmah~eN0nV6z_d4l-9PdEfijXmR3PPs33lTL+R$Ej1ntU*pvVTX^}Fd%_}%y5m;g} zMAX7zMje@$FqSBbu>P}TAIScgF>|gp%|@!5vTT{j<^~xtQ>X6US5P-yyzTwvy>rj~ z-Sc(N`(&KDJxIwukV?foJY;uL9id$VGKRXspG@=fBkk*V@X|N+U$nrNW)q48X~{aY3XWzNz*X`(x&l{A zt^(DhlK0`0SOVAZ^qk#(ELwvL^b6Y;&*IoJ*LJBz7`3itlExt*V35a22e>0q^ z5JTn;1G?!uRVqecFCSMVBCJtG)RY)3?607&h!)=>0s^YVeYxlslvS#I_bNsxlnKK- z2a(Q~wQG9>`Wm`x4j?lKY+seN3g8>J40KsE{INy>Q}trFn=J=# zhXAxWGUzkvIN5iuN3vDXb}5cZj9rGKLbD6_d{a4FMr<(=&=BY(Fa;mllhB_qTeck% z9qPzR&I>rbGYfP_WYF%|6nUTMU4(~DMofq}wrz0Daa~gGS6BlIYfxeBF~i4oE8$i{ z5nABfv+OCRs73@m8MSc7sTK1HFM(>%H{GN72xb)w)ewPmX_hs za;Pm*a|tjSWE3{gQl$rZfdo@}3$?fwIibJMfCUcb{cIX0u3PaN$s zX%{7B8`UY8d5prY;u#*548_A-f~9x-tcDSj25Q%EOwVy-GFC7BcVMr_{;zQcmono& zMn5_hM_}oBTs(%&IV%8nQ38}2Whe>ev%}6fbF%Q;Wmov^@1iVC($X%w^cguk5vN~d zxKWglEEwZsUOdC2a)q77#VZd9OIeq_t-h5MFto6YjH}=&ti`^H0p{2kO6`WyZWS<| z)qG2OGQR7{susK!irU@QVXJp}T3I8}{}JBxOiHCL*6v`PEqm~a9n7s+TV-z6Sx*F> z`bNiIM~HT_F1O3$u-o?5v3r~??0&Mli-3i|MGPTDeRG}1<7{x&*R?ubEpWG0t7Es4 zWpe*n5-?Uss-A!gPmiC%EhZHv+A<6&emXBe=LPA!o}wAe%H!7IT_YVM>}bbC^y#kA zuJaLojVYip1vMtWfPwF&I!N318F<@tFt8y8?(9=b>-~&5z?g%K*)PC_o)EKK<&QN6 zVvWIAV~=Hq(I2OVMI*~c(I{s+pq;?SshST2bI-5CFB=&O~_qdUvCPFmXZS~HI-kv<9 zCA6d;P3KL+b**HO5y7Qi8g46TINz(sjbce8lyFy03i|FOq0BDEZIp(ngV_{z?uCOL z)HwvdC2fKmsS$Adpqvgxw7OdBn%S2~y2Ezpi5&z+i5-_0?br^(eJRm15>@Y({$lU$ zp{9UDAC%~O3Sqi07wI|stkj}?BHR>cm}*wQgF_F&@|tL{Fc&G|L4T5Pv9m++;k9b^ z5;--V0ErZiaASuD*JCpmu1yDU;14Szr-?mPi!FVNEF@^{a66tfIE^R}@Zsqxg;~dX zn6s{hzmA-Q+RZwcJD`TMN3}wtVo6T{|Izo?a^FMlJF3mp3lOTvE7* zq`{|N&9Yp~f&VFJCUwFJ&<@16Ftz%FPn&Uki!`sN( z!jl>spnEV*<+Tp&oaZe=+64l093;Z!p*Yz5jtce;#aZy3iJIq0hz5o^4zx6RdK$d! VQ2RWQFFamc9*G2VJPcfQ{sZefgMk15 diff --git a/webinterface/minibase/database/__pycache__/utils.cpython-311.pyc b/webinterface/minibase/database/__pycache__/utils.cpython-311.pyc index 8db3dfb0fcb5230a2d9fb5c119740fd00dbee200..b46f2571b9a61e15a51bc77cd06af5f6ff8fe275 100644 GIT binary patch literal 14151 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 C3+ibA diff --git a/webinterface/minibase/database/company.csv b/webinterface/minibase/database/company.csv new file mode 100644 index 00000000..1f4b34f1 --- /dev/null +++ b/webinterface/minibase/database/company.csv @@ -0,0 +1,5 @@ +name,legal_entity_id,relation_id,industry_id,status_id,website,street_bill,street_no_bill,city_bill,post_code_bill,state_bill,country_bill,street_ship,street_no_ship,city_ship,post_code_ship,state_ship,country_ship +Steinel,1,1,1,1,www.steinel.ch,Almeinstrasse,10,Einsiedeln,8406,Schwyz,Switzerland,Almeinstrasse,10,Einsiedeln,8406,Schwyz,Switzerland +Kynsight,2,2,3,1,www.kynsight.com,Meierackerestrasse,10,Uster,8610,Zürich,Switzerland,Meierackerestrasse,10,Uster,8610,Zürich,Switzerland +V-zug,3,1,2,1,www.v-zug.com,Industriestrasse,66,Zug,6302,Zug,Switzerland,Industriestrasse,66,Zug,6302,Zug,Switzerland +Stmicroelectronics,1,2,1,1,www.stm.com,Champ-des-Filles,39,Plan-les-Ouates,1228,Geneva,Switzerland,Champ-des-Filles,39,Plan-les-Ouates,1228,Geneva,Switzerland diff --git a/webinterface/minibase/database/company_legal_entity.csv b/webinterface/minibase/database/company_legal_entity.csv new file mode 100644 index 00000000..7319a702 --- /dev/null +++ b/webinterface/minibase/database/company_legal_entity.csv @@ -0,0 +1,9 @@ +name,description +AG,Aktiengesellschaft +GmbH,Gesellschaft mit beschränkter Haftung +SA,Société anonyme +SARL,Société à responsabilité limitée +EINZEL F.,Einzelfirma +KOLLEKTIV,Kollektivgesellschaft +E. INDIVIDIUEL,Entreprise individuel +COLLECTIF,Société en nom collectif diff --git a/webinterface/minibase/database/company_relation.csv b/webinterface/minibase/database/company_relation.csv new file mode 100644 index 00000000..8af917f1 --- /dev/null +++ b/webinterface/minibase/database/company_relation.csv @@ -0,0 +1,5 @@ +name,description +Customer,Buying company +Supplier,Selling company +Producer,Main producer may sell directly or trough a second channel +Collaborator,Whith whom we work together. Buying and Selling diff --git a/webinterface/minibase/database/company_status.csv b/webinterface/minibase/database/company_status.csv new file mode 100644 index 00000000..97cf78aa --- /dev/null +++ b/webinterface/minibase/database/company_status.csv @@ -0,0 +1,5 @@ +name,description +Activ,Actively making business +Closed,Out ob business +Bankrupt,Went bankrupt +Ignoring,Company with whom we don’t want to do business diff --git a/webinterface/minibase/database/industry.csv b/webinterface/minibase/database/industry.csv new file mode 100644 index 00000000..72614390 --- /dev/null +++ b/webinterface/minibase/database/industry.csv @@ -0,0 +1,8 @@ +name,description +Industrial,Active in industrial area tend to ask for long life components +Medical,Very long engineering time. Life sensitive devices may be prone to get rejects from certain manufactures +Consumer,High volume and short life cycles +Defence,May not be subjected to the same restrictions as Military but please discuss it with manufacturers. +Military,The most difficult type of customer as many manufacturers does not desire to work with them +Automotive,High volumes High life cycle +Aerospatial,Low volume very long lifecycles and price does rarely play a role diff --git a/webinterface/minibase/database/models.py b/webinterface/minibase/database/models.py index a94770c2..36249d2d 100644 --- a/webinterface/minibase/database/models.py +++ b/webinterface/minibase/database/models.py @@ -253,6 +253,7 @@ class Company(db.Model): employees = db.relationship('Person', backref='employer', lazy=True) projects = db.relationship('Project', backref='belongs_to', lazy=True) notes = db.relationship('Company_note', backref='company', lazy=True) + products = db.relationship('Product', backref='manufacturer', lazy=True) # returns a more information-rich, or official, string representation of an object @@ -334,11 +335,11 @@ class Project_element(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) name = db.Column(db.String(100), nullable=False) description = db.Column(db.String(300), nullable=False) - qte_per_project = db.Column(db.Integer, nullable=False, default='0') + qte_per_project = db.Column(db.Integer, nullable=False, default='1') upload_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) last_update_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow) - project_id = db.Column(db.Integer, db.ForeignKey('project.id'), nullable=True) + project_id = db.Column(db.Integer, db.ForeignKey('project.id'), nullable=False) owner_id = db.Column(db.Integer, db.ForeignKey('person.id'), nullable=False) status_id = db.Column(db.Integer, db.ForeignKey('project_status.id'), nullable=False) @@ -366,9 +367,11 @@ class Project_status(db.Model): class Product(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) + name = db.Column(db.String(100), nullable=False) + ordering_code = db.Column(db.String(100), nullable=False) buy_cost = db.Column(db.Float, nullable=False) - comment = db.Column(db.String(300), nullable=False) - comment_manufacturer = db.Column(db.String(300), nullable=False) + comment = db.Column(db.String(300), nullable=True) + comment_manufacturer = db.Column(db.String(300), nullable=True) currency = db.Column(db.String(50), nullable=False) description = db.Column(db.String(300), nullable=False) last_time_buy_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) @@ -377,26 +380,30 @@ class Product(db.Model): minimum_order_quantity = db.Column(db.Integer, nullable=False) minimum_quote_quantity = db.Column(db.Integer, nullable=False) obsolete_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) - ordering_code = db.Column(db.String(100), nullable=False) pollution_level = db.Column(db.String(50), nullable=True) - price_change_flag = db.Column(db.Boolean, nullable=False, default='0') - pricing_scheme = db.Column(db.String(300), nullable=False) - proposed_margin = db.Column(db.Float, nullable=False) + price_change_flag = db.Column(db.Boolean, nullable=False, default=False) + proposed_margin = db.Column(db.Float, nullable=True) + production_country = db.Column(db.String(75), nullable=True, default='') upload_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) last_update_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow) + classification_id = db.Column(db.Integer, db.ForeignKey('product_classification.id'), nullable=True) + domain_id = db.Column(db.Integer, db.ForeignKey('product_domain.id'), nullable=True) + category_id = db.Column(db.Integer, db.ForeignKey('product_category.id'), nullable=True) + sub_category_id = db.Column(db.Integer, db.ForeignKey('product_sub_category.id'), nullable=True) + status_id = db.Column(db.Integer, db.ForeignKey('product_status.id'), nullable=False) - classification_id = db.Column(db.Integer, db.ForeignKey('product_classification.id'), nullable=False) - packaging_id = db.Column(db.Integer, db.ForeignKey('product_packaging.id'), nullable=False) - physical_id = db.Column(db.Integer, db.ForeignKey('product_physical.id'), nullable=False) + eligibility_id = db.Column(db.Integer, db.ForeignKey('product_eligibility.id'), nullable=False) + + packaging_id = db.Column(db.Integer, db.ForeignKey('product_packaging.id'), nullable=True) + physical_id = db.Column(db.Integer, db.ForeignKey('product_physical.id'), nullable=True) + manufacturer_id = db.Column(db.Integer, db.ForeignKey('company.id'), nullable=False) class Product_status(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) name = db.Column(db.String(50), nullable=False) description = db.Column(db.String(300), nullable=False) - upload_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) - last_update_date = db.Column(db.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow) products = db.relationship('Product', backref='status', lazy=True) @@ -405,6 +412,18 @@ class Product_status(db.Model): return f"{self.name}" +class Product_eligibility(db.Model): + id = db.Column(db.Integer, nullable=False, primary_key=True) + name = db.Column(db.String(50), nullable=False) + description = db.Column(db.String(300), nullable=False) + + products = db.relationship('Product', backref='eligibility', lazy=True) + + # returns a more information-rich, or official, string representation of an object + def __repr__(self): + return f"{self.name}" + + class Product_classification(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) name = db.Column(db.String(50), nullable=False) @@ -417,13 +436,48 @@ class Product_classification(db.Model): return f"{self.name}" +class Product_domain(db.Model): + id = db.Column(db.Integer, nullable=False, primary_key=True) + name = db.Column(db.String(50), nullable=False) + description = db.Column(db.String(300), nullable=False) + + products = db.relationship('Product', backref='domain', lazy=True) + + # returns a more information-rich, or official, string representation of an object + def __repr__(self): + return f"{self.name}" + + +class Product_category(db.Model): + id = db.Column(db.Integer, nullable=False, primary_key=True) + name = db.Column(db.String(50), nullable=False) + description = db.Column(db.String(300), nullable=False) + + products = db.relationship('Product', backref='category', lazy=True) + + # returns a more information-rich, or official, string representation of an object + def __repr__(self): + return f"{self.name}" + + +class Product_sub_category(db.Model): + id = db.Column(db.Integer, nullable=False, primary_key=True) + name = db.Column(db.String(50), nullable=False) + description = db.Column(db.String(300), nullable=False) + + products = db.relationship('Product', backref='sub_category', lazy=True) + + # returns a more information-rich, or official, string representation of an object + def __repr__(self): + return f"{self.name}" + + class Product_packaging(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) name = db.Column(db.String(50), nullable=False) description = db.Column(db.String(300), nullable=False) unit = db.Column(db.Integer) quantity = db.Column(db.Integer) - total = db.Column(db.Integer) products = db.relationship('Product', backref='packaging', lazy=True) @@ -436,23 +490,14 @@ class Product_physical(db.Model): id = db.Column(db.Integer, nullable=False, primary_key=True) name = db.Column(db.String(50), nullable=False) description = db.Column(db.String(300), nullable=False) - image_file = db.Column(db.String(20), nullable=False, default='default_company.jpg') + image_file = db.Column(db.String(20), nullable=False, default='default_product.jpg') pitch_x = db.Column(db.Float, nullable=True) pitch_y = db.Column(db.Float, nullable=True) size_x = db.Column(db.Float, nullable=True) size_y = db.Column(db.Float, nullable=True) size_z = db.Column(db.Float, nullable=True) - type = db.Column(db.String(50), nullable=False) products = db.relationship('Product', backref='physical', lazy=True) # returns a more information-rich, or official, string representation of an object def __repr__(self): return f"{self.name}" - -''' - physical (MUL, int) - container (varchar) - favourite (tinyint, NULL, nullable) - manufacturer (varchar) - production_site (varchar) -''' diff --git a/webinterface/minibase/database/note_status.csv b/webinterface/minibase/database/note_status.csv new file mode 100644 index 00000000..1cdc7c79 --- /dev/null +++ b/webinterface/minibase/database/note_status.csv @@ -0,0 +1,5 @@ +name,description +Open,Open and need action +Pending,Pending We are waiting on someone +Done,Done we have solved the issue +Closed,Closed as no action is required anymore diff --git a/webinterface/minibase/database/person.csv b/webinterface/minibase/database/person.csv new file mode 100644 index 00000000..41ae2d9b --- /dev/null +++ b/webinterface/minibase/database/person.csv @@ -0,0 +1,3 @@ +name,last_name,company_id,role_id,competence_id,mail_prof,mail_priv,tel_prof_mobile,street_name,street_no,city,post_code,state,country +Kerem,Yollu,2,3,1,kerem.yollu_at_kynsight.com,kerem.yollu@gmail.com,41789716697,Meierackerstrasse,10,Uster,8610,Zürich,Switzerland +Stefan,Walker,1,2,2,stefan.walker_at_steinel.ch,stefan.walker@gmail.com,41789716697,Almeinderstrasse,10,Einsiedeln,8410,Schwyz,Switzerland diff --git a/webinterface/minibase/database/person_competence.csv b/webinterface/minibase/database/person_competence.csv new file mode 100644 index 00000000..68518a31 --- /dev/null +++ b/webinterface/minibase/database/person_competence.csv @@ -0,0 +1,6 @@ +name,description +Embedded Software,Embedded Software +Embedded Hardware,Embedded Hardware +Hardware,Electronics Hardware +Software,Electronics Software +Mechanical,Mechanical Engineer diff --git a/webinterface/minibase/database/person_role.csv b/webinterface/minibase/database/person_role.csv new file mode 100644 index 00000000..5d6c8b95 --- /dev/null +++ b/webinterface/minibase/database/person_role.csv @@ -0,0 +1,12 @@ +name,description +Engineer,An engineer in any domain +Engineering Manager,Engineering Responsible +Sales,Too much blabla +Sales Manager,Manages sales +Purchasing,Purchases required Material +Purchasing Manager,Manages purchasing team +Purchasing Strategical,Strategically Purchases required Materials on specific domain +CEO,Chief Executive Officer +CTO,Chief Technology Officer +Human Resources,Human Trafikers +Secretary,Knows Everything diff --git a/webinterface/minibase/database/product.csv b/webinterface/minibase/database/product.csv new file mode 100644 index 00000000..a16ee01d --- /dev/null +++ b/webinterface/minibase/database/product.csv @@ -0,0 +1,3 @@ +name,ordering_code,buy_cost,currency,description,lead_time_days,minimum_awarding_quantity,minimum_order_quantity,minimum_quote_quantity,classification_id,domain_id,category_id,sub_category_id,status_id,eligibility_id,packaging_id,physical_id,manufacturer_id +SMT32F031FQH,SMT32F031FQH,3,USD,SMT32F031FQH MCU,64,1000,500,500,1,1,1,1,1,1,1,1,3 +SMT32F456QQA,SMT32F456QQA,10,USD,SMT32F456QQA MCU,180,1000,250,250,2,2,2,2,2,2,2,2,3 diff --git a/webinterface/minibase/database/product_category.csv b/webinterface/minibase/database/product_category.csv new file mode 100644 index 00000000..f47e5e61 --- /dev/null +++ b/webinterface/minibase/database/product_category.csv @@ -0,0 +1,10 @@ +mane,description +Transistor,A transistor is a miniature semiconductor that regulates or controls current or voltage flow in addition amplifying and generating these electrical signals and acting as a switch/gate for them. +Op-amp ,A op-amp is an analog circuit block that takes a differential voltage input and produces a single-ended voltage output +MCU,A microcontroller (μC) or microcontroller unit (MCU) is a small computer on a single integrated circuit. +FPGA,Field Programmable Gate Arrays +CPLD,A Complex Programmable Logic Device +Resistor,Resistor +Connector,Connector +Cable,Cable +Logic,Logic diff --git a/webinterface/minibase/database/product_classification.csv b/webinterface/minibase/database/product_classification.csv new file mode 100644 index 00000000..dc539e18 --- /dev/null +++ b/webinterface/minibase/database/product_classification.csv @@ -0,0 +1,6 @@ +name,description +Passive,Passive components like resistors +Active ,Active components like transistors of op-amps +Electromechanical,Electromechanical components like connectors +Mechanical,Purely Mechanical components like PCB or housings +Hardware,general hardware like Screws and so diff --git a/webinterface/minibase/database/product_domain.csv b/webinterface/minibase/database/product_domain.csv new file mode 100644 index 00000000..f56ecf56 --- /dev/null +++ b/webinterface/minibase/database/product_domain.csv @@ -0,0 +1,8 @@ +name,description +Power,Power Components like IGBTs +Precision,Precision Components like precision op-amps +Ev-Charging,Components for ev-chaging like charging cables +Security,Security Components like e-fuses +Programmable,Programmable Components +High speed,High speed relevant components rj45 and os on +Radio,telecommunication components diff --git a/webinterface/minibase/database/product_eligibility.csv b/webinterface/minibase/database/product_eligibility.csv new file mode 100644 index 00000000..e8453d29 --- /dev/null +++ b/webinterface/minibase/database/product_eligibility.csv @@ -0,0 +1,5 @@ +name,description +Standard,Standard products do not have a pricing plan or scheme +Design Registrable,Products with special pricing schemes (manufacturer rules apply and differs for each component) +Restricted,This product is restricted to o given market or Region in the world +Mutli source,This component is produced by may manufacturers diff --git a/webinterface/minibase/database/product_packaging.csv b/webinterface/minibase/database/product_packaging.csv new file mode 100644 index 00000000..bae36be3 --- /dev/null +++ b/webinterface/minibase/database/product_packaging.csv @@ -0,0 +1,7 @@ +name,description,unit,quantity +Tape,Taped packaging,1,1000 +Reel,Reeled packaging,1,1000 +Tape and Reel,Taped and Reeled packaging,1,5000 +Box,Box,5,1000 +Single,Single Unit,1,1 +Tray,Tray units,1,250 diff --git a/webinterface/minibase/database/product_physical.csv b/webinterface/minibase/database/product_physical.csv new file mode 100644 index 00000000..dbe1314e --- /dev/null +++ b/webinterface/minibase/database/product_physical.csv @@ -0,0 +1,8 @@ +name,description +SOP-18,Small-outline package +CSOP-24,Ceramic small-outline package +DSOP-18,Dual small-outline package +HSOP-32,Thermally-enhanced small-outline package +HSSOP-18,Thermally-enhanced shrink small-outline package +HTSSOP-18,Thermally-enhanced thin shrink small-outline package +MSOP-8,Mini small-outline package diff --git a/webinterface/minibase/database/product_status.csv b/webinterface/minibase/database/product_status.csv new file mode 100644 index 00000000..3bd5e570 --- /dev/null +++ b/webinterface/minibase/database/product_status.csv @@ -0,0 +1,11 @@ +name,description +New,Newly put on data base (Default) +Pending,Registration request sent to Manufacturer and we are waiting for an answer +Accepted,Registration was successful +Denied,Registration was denied ( Negotiation is possible) +Already registered,Competitor has it already registered +Closed,Closed by us +Rejected,Registration was rejected (no Negotiation is possible) +Fulfillment,Only a margin will be given but no registration process +Open For all,Everyone get the same margin for this component +Not Registrable,Not par of a special pricing scheme diff --git a/webinterface/minibase/database/product_sub_category.csv b/webinterface/minibase/database/product_sub_category.csv new file mode 100644 index 00000000..28cb1c7e --- /dev/null +++ b/webinterface/minibase/database/product_sub_category.csv @@ -0,0 +1,12 @@ +name,description +Mosfet NPN,Mosfet NPN Transistor +Mosfet PNP,Mosfet PNP Transistor +Bipolar NPN,Bipolar NPN Transistor +Bipolar NPN,Bipolar NPN Transistor +Rail to Rial,Rail to Rail Op-amp +Cortex M4,Cortex M4 Core MCU +Cortex M0,Cortex M0 Core MCU +Thick film,Thick film Resistor +Thin film,Thin film Resistor +Metal film,Metal film Resistor +Carbon,Carbon Resistor diff --git a/webinterface/minibase/database/project.csv b/webinterface/minibase/database/project.csv new file mode 100644 index 00000000..b0581036 --- /dev/null +++ b/webinterface/minibase/database/project.csv @@ -0,0 +1,3 @@ +name,description,company_id,status_id,industry_id,owner_id,qte_prototype,qte_start,qte_production +STWA-HS,Aküsprühgerät für hautmittel,1,1,1,1,10,5000,10000 +Kolibri,Shisha Heat element,2,1,2,1,5,500,1000 diff --git a/webinterface/minibase/database/project_element.csv b/webinterface/minibase/database/project_element.csv new file mode 100644 index 00000000..63aabcf3 --- /dev/null +++ b/webinterface/minibase/database/project_element.csv @@ -0,0 +1,3 @@ +name,description,qte_per_project,project_id,owner_id,atatus_id +Power Board,Dc-Dc regulation fo batteries,8,1,1,1 +Ui,user input,1,1,1,1 diff --git a/webinterface/minibase/database/project_status.csv b/webinterface/minibase/database/project_status.csv new file mode 100644 index 00000000..e18bec48 --- /dev/null +++ b/webinterface/minibase/database/project_status.csv @@ -0,0 +1,8 @@ +name,description +Open,Ongoing project +Pending,Waiting on something +Closed,Closed project that did not go to production +Production,Is in production +Prototyping,Is in prototyping phase +End Of Life,End of Lifed projects. +Redesign,An old project being redone it must be linked to another project diff --git a/webinterface/minibase/database/utils.py b/webinterface/minibase/database/utils.py index 9738ca57..2f6a7285 100644 --- a/webinterface/minibase/database/utils.py +++ b/webinterface/minibase/database/utils.py @@ -1,7 +1,9 @@ from minibase.database.models import Company, Company_relation, Company_legal_entity -from minibase.database.models import Industry +from minibase.database.models import Industry, Countries from minibase.database.models import Person, Person_role, Person_competence -from minibase.database.models import Countries +from minibase.database.models import Project, Project_element, Product +from minibase import db +from numpy import genfromtxt # Gets the id of company from the formated output defined at models.py for the Company Model @@ -17,6 +19,7 @@ def getPersonRoleId(nameForId): selection = Person_role.query.filter_by(name=nameForId).first() return selection.id + # Gets the id of Person's competence def getPersonCompetenceId(nameForId): selection = Person_competence.query.filter_by(name=nameForId).first() @@ -133,3 +136,167 @@ def country_choices(): choices = Countries.query.all() return choices +################################################################################################### +# CSV manipulation +################################################################################################### + +def openCsv(filename): + data = genfromtxt(filename, + delimiter=',', + skip_header=1, + dtype=None, + encoding='UTF-8') + return data.tolist() + + +def db_add_name_and_description(csv, table): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = table(**{ + 'name': i[0], + 'description': i[1]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_company(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Company(**{ + 'name': i[0], + 'legal_entity_id': i[1], + 'relation_id': i[2], + 'industry_id': i[3], + 'status_id': i[4], + 'website': i[5], + 'street_bill': i[6], + 'street_no_bill': i[7], + 'city_bill': i[8], + 'post_code_bill': i[9], + 'state_bill': i[10], + 'country_bill': i[11], + 'street_ship': i[12], + 'street_no_ship': i[13], + 'city_ship': i[14], + 'post_code_ship': i[15], + 'state_ship': i[16], + 'country_ship': i[17]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_person(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Person(**{ + 'name': i[0], + 'last_name': i[1], + 'company_id': i[2], + 'role_id': i[3], + 'competence_id': i[4], + 'mail_prof': i[5], + 'mail_priv': i[6], + 'tel_prof_mobile': i[7], + 'street_name': i[8], + 'street_no': i[9], + 'city': i[10], + 'post_code': i[11], + 'state': i[12], + 'country': i[13] + }) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_project(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Project(**{ + 'name': i[0], + 'description': i[1], + 'company_id': i[2], + 'status_id': i[3], + 'industry_id': i[4], + 'owner_id': i[5], + 'qte_prototype': i[6], + 'qte_start': i[7], + 'qte_production': i[8] + }) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) + + +def db_add_project_element(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Project_element(**{ + 'name': i[0], + 'description': i[1], + 'qte_per_project': i[2], + 'project_id': i[3], + 'owner_id': i[4], + 'status_id': i[5]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) + +def db_add_product(csv): + try: + csv_list = openCsv(csv) + for i in csv_list: + record = Product(**{ + 'name': i[0], + 'ordering_code': i[1], + 'buy_cost': i[2], + 'currency': i[3], + 'description': i[4], + 'lead_time_days': i[5], + 'minimum_awarding_quantity': i[6], + 'minimum_order_quantity': i[7], + 'minimum_quote_quantity': i[8], + 'classification_id': i[9], + 'domain_id': i[10], + 'category_id': i[11], + 'sub_category_id': i[12], + 'status_id': i[13], + 'eligibility_id': i[14], + 'packaging_id': i[15], + 'physical_id': i[16], + 'manufacturer_id': i[17]}) + db.session.add(record) # Add all the records + db.session.commit() # Attempt to commit all the records + except Exception as error: + db.session.rollback() # Rollback the changes on error + print(csv) + print("Error Ocured during <> upload to DB") + print(error) + + + diff --git a/webinterface/minibase/product/forms.py b/webinterface/minibase/product/forms.py new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/webinterface/minibase/product/forms.py @@ -0,0 +1 @@ + diff --git a/webinterface/minibase/product/routes.py b/webinterface/minibase/product/routes.py new file mode 100644 index 00000000..e69de29b diff --git a/webinterface/minibase/project/routes.py b/webinterface/minibase/project/routes.py index e69de29b..026bad8e 100644 --- a/webinterface/minibase/project/routes.py +++ b/webinterface/minibase/project/routes.py @@ -0,0 +1,37 @@ +from flask import render_template, url_for, flash, redirect, request, Blueprint +from minibase import db +from minibase.config import themeMinibase +from minibase.database.models import Company, Company_legal_entity, Company_relation,Company_status +from minibase.database.models import Industry, Note_status +from minibase.database.models import Person_role, Person_competence +from minibase.database.models import Project_status +from minibase.admin.forms import compLegalEntityForm, compRelationForm, industryRegisterForm,personRoleForm, personCompetenceForm, compStatusForm, noteStatusForm +from minibase.admin.forms import projectStatusForm +# Declaring a blueprint +project = Blueprint('project', __name__) + + +@admin.route("/register", methods=['GET', 'POST']) +def register(): + form = register() + legal_entities = Company_legal_entity.query.order_by(Company_legal_entity.name.asc()) + if form.validate_on_submit(): + companyLegal = Company_legal_entity( + name=form.name.data, + description=form.description.data) + # Here we need to give the id of thr role as this is a foreign key + db.session.add(companyLegal) + db.session.commit() + + flash(f'{"Company Legal Entity registered!"}', 'success') + return render_template('admin/company_register_legal_entity.html', + title='Register Company Legal Entity', + legal_entities=legal_entities, + theme=themeMinibase, + form=form) + + return render_template('admin/company_register_legal_entity.html', + title='Register Company Legal Entity', + legal_entities=legal_entities, + theme=themeMinibase, + form=form) diff --git a/webinterface/minibase/site.db b/webinterface/minibase/site.db index 6ccc2b3c20a3d66a17229604119f10413201aa43..aaf4d73b31fc03fe701162760cd91d80c54826aa 100644 GIT binary patch literal 290816 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 literal 0 HcmV?d00001 diff --git a/webinterface/minibase/templates/admin/company_register_industry.html b/webinterface/minibase/templates/admin/company_register_industry.html deleted file mode 100644 index 3ee67fde..00000000 --- a/webinterface/minibase/templates/admin/company_register_industry.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
- {{ form.hidden_tag() }} -
- Register Company Endustry - - -
- {{ form.name.label(class="form-control-label") }} - {% if form.name.errors %} - {{ form.name(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.name(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.description.label(class="form-control-label") }} - {% if form.description.errors %} - {{ form.description(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.description(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.submit(class="btn btn-outline-info") }} -
- -
-
-
-

Existing Industries

- - - - - - - - - {% for item in industries %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
-{% endblock content %} diff --git a/webinterface/minibase/templates/admin/company_register_legal_entity.html b/webinterface/minibase/templates/admin/company_register_legal_entity.html deleted file mode 100644 index a2fe24c7..00000000 --- a/webinterface/minibase/templates/admin/company_register_legal_entity.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
- {{ form.hidden_tag() }} -
- Register Company Legal Entity - - -
- {{ form.name.label(class="form-control-label") }} - {% if form.name.errors %} - {{ form.name(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.name(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.description.label(class="form-control-label") }} - {% if form.description.errors %} - {{ form.description(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.description(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.submit(class="btn btn-outline-info") }} -
- -
-
-
-

Existing Legal Entities

- - - - - - - - - {% for item in legal_entities %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
-{% endblock content %} diff --git a/webinterface/minibase/templates/admin/company_register_relation.html b/webinterface/minibase/templates/admin/company_register_relation.html deleted file mode 100644 index b9985672..00000000 --- a/webinterface/minibase/templates/admin/company_register_relation.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "layout.html" %} - - -{% block content %} -
-
- {{ form.hidden_tag() }} -
- Register Company Relation - - -
- {{ form.name.label(class="form-control-label") }} - {% if form.name.errors %} - {{ form.name(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.name(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.description.label(class="form-control-label") }} - {% if form.description.errors %} - {{ form.description(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.description(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.submit(class="btn btn-outline-info") }} -
- -
-
-
-

Existing Relations

- - - - - - - - - {% for item in relations %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
-{% endblock content %} diff --git a/webinterface/minibase/templates/admin/person_register_competence.html b/webinterface/minibase/templates/admin/person_register_competence.html deleted file mode 100644 index 4ea4a7b2..00000000 --- a/webinterface/minibase/templates/admin/person_register_competence.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
- {{ form.hidden_tag() }} -
- Register Person Competence - - -
- {{ form.name.label(class="form-control-label") }} - {% if form.name.errors %} - {{ form.name(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.name(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.description.label(class="form-control-label") }} - {% if form.description.errors %} - {{ form.description(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.description(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.submit(class="btn btn-outline-info") }} -
- -
-
-
-

Existing Competences

- - - - - - - - - {% for item in competences %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
-{% endblock content %} diff --git a/webinterface/minibase/templates/admin/person_register_role.html b/webinterface/minibase/templates/admin/person_register_role.html deleted file mode 100644 index b6c14921..00000000 --- a/webinterface/minibase/templates/admin/person_register_role.html +++ /dev/null @@ -1,86 +0,0 @@ -{% extends "layout.html" %} -{% block content %} -
-
- {{ form.hidden_tag() }} -
- Register Person Role - - -
- {{ form.name.label(class="form-control-label") }} - {% if form.name.errors %} - {{ form.name(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.name(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.description.label(class="form-control-label") }} - {% if form.description.errors %} - {{ form.description(class="form-control form-control-lg is-invalid") }} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% else %} - {{ form.description(class="form-control form-control-lg") }} - {% endif %} -
- - -
- {{ form.submit(class="btn btn-outline-info") }} -
- -
-
- -
-
-

Existing Roles

- - - - - - - - - {% for item in roles %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
-

Existing Roles

- - - - - - - - - {% for item in roles %} - - - - - {% endfor %} - -
NameDescription
{{ item.name }}{{ item.description}}
-
- -{% endblock content %} diff --git a/webinterface/minibase/templates/admin/status_register.html b/webinterface/minibase/templates/admin/register_name_and_desc.html similarity index 93% rename from webinterface/minibase/templates/admin/status_register.html rename to webinterface/minibase/templates/admin/register_name_and_desc.html index 55b3c83e..59b04f68 100644 --- a/webinterface/minibase/templates/admin/status_register.html +++ b/webinterface/minibase/templates/admin/register_name_and_desc.html @@ -4,7 +4,7 @@
{{ form.hidden_tag() }}
- Register Status + {{ title }}
@@ -44,7 +44,7 @@
-

Existing Statuses

+

{{ tableTitle }}

@@ -53,7 +53,7 @@ - {% for item in statuses %} + {% for item in dbTable %} diff --git a/webinterface/minibase/templates/layout.html b/webinterface/minibase/templates/layout.html index 257c193a..658b0204 100644 --- a/webinterface/minibase/templates/layout.html +++ b/webinterface/minibase/templates/layout.html @@ -47,13 +47,24 @@
Company Regiters Legal EntityCompany Register Relation - Company Register Industry + Company Register Status
- Person Register RolePerson Register Competence + Person Register Role +
+ Project Register Status +
+ Product Register Status + Product Register Eligibility + Product Register Domain + Product Register Classification + Product Register Category + Product Register Sub Category + Product Register Physical + Product Register Packaging
- Status Register - Countries + Note Register Status + Register Industry
Database diff --git a/webinterface/prepare.py b/webinterface/prepare.py index 0ea2ea66..35eaebab 100644 --- a/webinterface/prepare.py +++ b/webinterface/prepare.py @@ -1,9 +1,10 @@ from minibase import db, create_minibase +import minibase.database.utils as dbUtils from minibase.database.models import Person, Person_role, Person_competence, Person_note from minibase.database.models import Company, Company_relation, Company_legal_entity, Company_note, Company_status from minibase.database.models import Status, Industry, Note_status from minibase.database.models import Project, Project_status, Project_element -from minibase.database.models import Product, Product_status, Project_element, Product_physical, Product_packaging +from minibase.database.models import Product, Product_status, Product_physical, Product_packaging, Product_domain, Product_eligibility, Product_category, Product_sub_category, Product_classification app = create_minibase() app.app_context().push() @@ -11,116 +12,21 @@ db.drop_all() db.create_all() - - ################################################################################################### -industry1 = Industry( - name='Industrial', - description="Active in Industrial area") -db.session.add(industry1) - -industry2 = Industry( - name='Consumer', - description="Active in Consumer area") -db.session.add(industry1) - -companyRelation1 = Company_relation( - name='Customer', - description="Only Buyiong customer") -db.session.add(companyRelation1) - -companyRelation2 = Company_relation( - name='Supplier', - description="Only Selling customer") -db.session.add(companyRelation2) - -companyRelation3 = Company_relation( - name='Collaborator', - description="Buying and Selling customer") -db.session.add(companyRelation2) -companyLegal1 = Company_legal_entity( - name='AG', - description='AktienGezelschaft') -db.session.add(companyLegal1) - -companyLegal2 = Company_legal_entity( - name='GMBH', - description='Gesellschaft mit beschränkter Haftung') -db.session.add(companyLegal2) +dbUtils.db_add_name_and_description("minibase/database/industry.csv", Industry) ################################################################################################### -companyStatus1 = Company_status( - name='Activ', - description='Company is active and business is running') -db.session.add(companyStatus1) - -companyStatus2 = Company_status( - name='Bankrupt', - description='Company is bankrupt') -db.session.add(companyStatus2) - -companyStatus3 = Company_status( - name='Closed', - description='Company is closed') -db.session.add(companyStatus3) -company1 = Company( - name='Steinel', - legal_entity_id='1', - relation_id='1', - industry_id='1', - status_id='1', - website='www.steinel.ch', - street_bill='Alemeinrstrasse', - street_no_bill='10', - city_bill='Einsiedeln', - post_code_bill='8406', - state_bill='Schyz', - country_bill='Switzerland', - street_ship='Alemeinrstrasse', - street_no_ship='10', - city_ship='Einsiedeln', - post_code_ship='8406', - state_ship='Schyz', - country_ship='Switzerland') -db.session.add(company1) +dbUtils.db_add_name_and_description("minibase/database/company_relation.csv", Company_relation) -company2 = Company( - name='Kynsight', - legal_entity_id='1', - relation_id='1', - industry_id='1', - status_id='3', - website='www.kynsight.com', - street_bill='Meierackerstrasse', - street_no_bill='10', - city_bill='Uster', - post_code_bill='8610', - state_bill='Zürich', - country_bill='Switzerland', - street_ship='Meierackerstrasse', - street_no_ship='10', - city_ship='Uster', - post_code_ship='8610', - state_ship='Zürich', - country_ship='Switzerland') -db.session.add(company2) +dbUtils.db_add_name_and_description("minibase/database/company_legal_entity.csv", Company_legal_entity) -noteStatus1 = Note_status( - name='Open', - description='Ongoing') -db.session.add(noteStatus1) +dbUtils.db_add_name_and_description("minibase/database/company_status.csv", Company_status) -noteStatus2 = Note_status( - name='Closed', - description='Ongoing') -db.session.add(noteStatus2) +dbUtils.db_add_company("minibase/database/company.csv") -noteStatus3 = Note_status( - name='Done', - description='Ongoing') -db.session.add(noteStatus3) +dbUtils.db_add_name_and_description("minibase/database/note_status.csv", Note_status) note1 = Company_note( title='Need to find a valid MCU For Stefan', @@ -148,69 +54,12 @@ db.session.add(note2) ################################################################################################### -PeresonRole1 = Person_role( - name='Engineer', - description='Standart Engineer') -db.session.add(PeresonRole1) +dbUtils.db_add_name_and_description("minibase/database/person_role.csv", Person_role) -PeresonRole2 = Person_role( - name='Engineerin Manager', - description='Manager for egineering') -db.session.add(PeresonRole2) +dbUtils.db_add_name_and_description("minibase/database/person_competence.csv", Person_competence) -PeresonRole3 = Person_role( - name='CEO', - description='Chief Executif Operation') -db.session.add(PeresonRole1) +dbUtils.db_add_person("minibase/database/person.csv") -PersonCompethence1 = Person_competence( - name='Embedded Systems', - description='Embedded Systems Engineer') -db.session.add(PersonCompethence1) - -PersonCompethence2 = Person_competence( - name='hardware', - description='Electronics Hardwre specialist') -db.session.add(PersonCompethence2) - -PersonCompethence3 = Person_competence( - name='Software', - description='Software engineer') -db.session.add(PersonCompethence1) - -person1 = Person( - name='Kerem', - last_name='Yollu', - company_id='2', - role_id='3', - competence_id='1', - mail_prof='kerem.yollu@kynsight.com', - mail_priv='kerem.yollu@gmail.com', - tel_prof_mobile='+41789716697', - street_name='Meierackerstrasse', - street_no='10', - city='Uster', - post_code='8610', - state='Zürich', - country='Switzerland') -db.session.add(person1) - -person2 = Person( - name='Stefan', - last_name='Walker', - company_id='1', - role_id='2', - competence_id='2', - mail_prof='stefan.walker@steinel.ch', - mail_priv='stefan.walker@gmail.com', - tel_prof_mobile='+4178956787', - street_name='Alemeinrstrasse', - street_no='10', - city='Einsiedeln', - post_code='8406', - state='Schyz', - country='Switzerland') -db.session.add(person2) note3 = Person_note( title='Birthday of Stefan', @@ -238,55 +87,19 @@ db.session.add(note5) ################################################################################################### +dbUtils.db_add_name_and_description("minibase/database/project_status.csv", Project_status) -projectStatus1 = Project_status( - name='Open', - description='Ongoing') -db.session.add(projectStatus1) +dbUtils.db_add_project("minibase/database/project.csv") -projectStatus2 = Project_status( - name='Closed', - description='Closed') -db.session.add(projectStatus2) +dbUtils.db_add_project_element("minibase/database/project_element.csv") -projectStatus3 = Project_status( - name='Pending', - description='Action Required') -db.session.add(projectStatus3) - - -project1 = Project( - name='STWA-HS', - description='Aküsprühgerät für hautmittel', - company_id='1', - status_id='1', - industry_id='1', - owner_id='1', - qte_prototype='10', - qte_start='5000', - qte_production='10000') -db.session.add(project1) - -element1 = Project_element( - name='Power Board', - description='Dc-Dc regulation fo batteries', - qte_per_project='8', - project_id='1', - owner_id='1', - status_id='1') - -db.session.add(element1) -''' ################################################################################################### -status1 = Status( - name='Obsolete', - description='Obsolete from Manufacturer') -db.session.add(status1) - -status2 = Status( - name='Active', - description='Everything is in order') -db.session.add(status2) -''' - -db.session.commit() +dbUtils.db_add_name_and_description("minibase/database/product_category.csv", Product_category) +dbUtils.db_add_name_and_description("minibase/database/product_classification.csv", Product_classification) +dbUtils.db_add_name_and_description("minibase/database/product_domain.csv", Product_domain) +dbUtils.db_add_name_and_description("minibase/database/product_eligibility.csv", Product_eligibility) +dbUtils.db_add_name_and_description("minibase/database/product_packaging.csv", Product_packaging) +dbUtils.db_add_name_and_description("minibase/database/product_physical.csv", Product_physical) +dbUtils.db_add_name_and_description("minibase/database/product_status.csv", Product_status) +dbUtils.db_add_name_and_description("minibase/database/product_sub_category.csv", Product_sub_category) +dbUtils.db_add_product("minibase/database/product.csv")
{{ item.name }} {{ item.description}}