Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add ability to create cross-reference matrices #1098

Closed
wants to merge 57 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
5c03e90
feat: add matrix table to program database
weibullguy Jun 23, 2022
9f5b2e7
feat: add matrix dbrecord model
weibullguy Jun 24, 2022
7219d49
feat: add matrix dbtable model
weibullguy Jun 24, 2022
b0b8dc8
refactor: change matrix table pkey to description field
weibullguy Jun 24, 2022
78bc847
feat: use description field to select matrix
weibullguy Jun 24, 2022
541dc88
test: add test suite for ramstk_matrix models
weibullguy Jun 24, 2022
e234193
style: add stub files
weibullguy Jun 24, 2022
284e8c2
style: replace try-except with contextlib.suppress
weibullguy Jun 24, 2022
e630d02
style: update to follow new styleguide for vars and args
weibullguy Jun 26, 2022
98c4217
refactor: make correlation field an integer
weibullguy Jun 26, 2022
e77768d
test: update tests for integer correlation field
weibullguy Jun 26, 2022
51b1122
style: update stub files
weibullguy Jun 26, 2022
4d3300c
refactor: remove deprecated methods from RAMSTKTreeView
weibullguy Jun 26, 2022
1c2dcbd
style: update stub file for RAMSTKTreeView
weibullguy Jun 26, 2022
0ef291f
feat: add new RAMSTKMatrixView widget
weibullguy Jul 1, 2022
e68a49b
style: add matrix view stub file
weibullguy Jul 1, 2022
c344ee1
test: add matrix view test suite
weibullguy Jul 1, 2022
cc51942
test: update conf.py to install icons for py 3.7
weibullguy Jul 1, 2022
e9f912e
feat: add dict to hold column and row database IDs
weibullguy Jul 3, 2022
6e58899
test: update RAMSTKMatrixView tests for new dicts
weibullguy Jul 3, 2022
6becb5f
style: update stub file
weibullguy Jul 3, 2022
cd5068d
refactor: set non-empty default value for widgets signal
weibullguy Jul 5, 2022
840e158
feat: add RAMSTKMatrixPanel widget
weibullguy Jul 5, 2022
6618be8
feat: add Validation cross-reference matrix panel
weibullguy Jul 5, 2022
8b2f8e7
build: move to autopep8 and remove setup.cfg
weibullguy Jul 6, 2022
af8eb7d
style: update args and vars to naming convention
weibullguy Jul 7, 2022
bbf0bc3
style: update stub files
weibullguy Jul 7, 2022
65de935
ci: update workflow file to use autopep8
weibullguy Jul 7, 2022
8386e5b
build: update poetry.lock
weibullguy Jul 13, 2022
cd90602
refactor: add matrix dataframe to table model
weibullguy Jul 16, 2022
f243cdf
refactor: add methods to insert columns and rows
weibullguy Jul 16, 2022
bfd746f
test: add tests for new methods
weibullguy Jul 16, 2022
512472c
style: update stub files
weibullguy Jul 16, 2022
15efa9f
build: update dependency versions
weibullguy Jul 16, 2022
70aaeab
Merge branch 'master' into feat/issue-52
weibullguy Jul 16, 2022
b799d32
build: update msys2 installs
weibullguy Jul 16, 2022
0618e69
build: update msys2 installs
weibullguy Jul 16, 2022
e23db74
build: update msys2 installs
weibullguy Jul 17, 2022
d428020
build: update msys2 installs
weibullguy Jul 17, 2022
fad2003
build: update msys2 installs
weibullguy Jul 17, 2022
c6d7649
build: update msys2 installs
weibullguy Jul 17, 2022
d5f2084
build: update msys2 installs
weibullguy Jul 17, 2022
c528b31
Merge master into feat/issue-52
weibullguy Jul 21, 2022
6983f1c
Merge branch 'master' into feat/issue-52
weibullguy Jul 21, 2022
07ece50
ci: update test suite workflow file
weibullguy Jul 21, 2022
72172d1
ci: update test suite workflow file
weibullguy Jul 21, 2022
fa62386
ci: update test suite workflow file
weibullguy Jul 21, 2022
6ceb91a
Merge 'master' into feat/issue-52
weibullguy Jul 22, 2022
5a27bb2
doc: update Sphinx configuration
weibullguy Jul 22, 2022
3c7b1f8
ci: add permissions to workflow
weibullguy Aug 2, 2022
bccb545
build: update lock file
weibullguy Aug 2, 2022
18e4688
Merge branch 'master' into feat/issue-52
weibullguy Aug 2, 2022
083d957
chore: update depedency versions
weibullguy Nov 16, 2022
c1a7c0c
Merge branch 'master' into feat/issue-52
weibullguy Jan 23, 2023
2fe6d3f
Merge master branch
weibullguy Mar 3, 2023
077e714
chore: fix workflow file error
weibullguy Mar 3, 2023
071c01b
style: black format revision record
weibullguy Mar 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: change matrix table pkey to description field
weibullguy committed Jun 24, 2022
commit b0b8dc8f6288f9868ea5791b1cd73acd9decf955
10 changes: 5 additions & 5 deletions data/postgres_program_db.sql
Original file line number Diff line number Diff line change
@@ -855,11 +855,11 @@ CREATE TABLE ramstk_validation (
CREATE TABLE ramstk_matrix (
fld_revision_id INTEGER NOT NULL,
fld_matrix_id INTEGER NOT NULL,
fld_description VARCHAR NULL,
fld_column_id INTEGER NULL,
fld_row_id INTEGER NULL,
fld_correlation VARCHAR NULL,
PRIMARY KEY (fld_matrix_id),
fld_description VARCHAR NOT NULL DEFAULT '',
fld_column_id INTEGER NULL DEFAULT 0,
fld_row_id INTEGER NULL DEFAULT 0,
fld_correlation VARCHAR NULL DEFAULT '',
PRIMARY KEY (fld_description),
FOREIGN KEY(fld_revision_id) REFERENCES ramstk_revision (fld_revision_id) ON DELETE CASCADE
);

4 changes: 3 additions & 1 deletion src/ramstk/models/dbrecords/programdb_matrix_record.py
Original file line number Diff line number Diff line change
@@ -41,15 +41,17 @@ class RAMSTKMatrixRecord(RAMSTK_BASE, RAMSTKBaseRecord): # type: ignore
matrix_id = Column(
"fld_matrix_id",
Integer,
primary_key=True,
primary_key=False,
default=-1,
nullable=False,
)

description = Column(
"fld_description",
String,
primary_key=True,
default=__defaults__["description"],
nullable=False,
)
column_id = Column(
"fld_column_id",
1 change: 1 addition & 0 deletions src/ramstk/models/dbtables/programdb_matrix_table.py
Original file line number Diff line number Diff line change
@@ -70,5 +70,6 @@ def do_get_new_record( # pylint: disable=method-hidden
_new_record = self._record()
_new_record.revision_id = attributes["revision_id"]
_new_record.matrix_id = self.last_id + 1
_new_record.description = ""

return _new_record