-
Notifications
You must be signed in to change notification settings - Fork 1
SC-180 Added Drawing Button #474
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
base: master
Are you sure you want to change the base?
Conversation
f3d0900
to
309bfda
Compare
I don't see it on the Asset Connections page in NMW. Also placement of the button is no good. Also this doesn't work if the Asset has more than one Substation. |
3c968f6
to
ab53990
Compare
ab53990
to
ebf210d
Compare
5f590e8
to
c037861
Compare
c037861
to
52f0c10
Compare
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
...ications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/LocationDrawings.tsx
Outdated
Show resolved
Hide resolved
...ications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/LocationDrawings.tsx
Outdated
Show resolved
Hide resolved
...ications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/LocationDrawings.tsx
Outdated
Show resolved
Hide resolved
...ications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/LocationDrawings.tsx
Outdated
Show resolved
Hide resolved
...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/ConnectionPage.tsx
Outdated
Show resolved
Hide resolved
a8bcd7b
to
dcd5ad4
Compare
183a6ab
to
0c8ec5e
Compare
94d3b84
to
2e5d085
Compare
24e3ef6
to
e9f2a13
Compare
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Outdated
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Outdated
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Outdated
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Outdated
Show resolved
Hide resolved
c73153e
to
c777394
Compare
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
const isValid = (location: OpenXDA.Types.Location, drawingData) => { | ||
let e = ""; | ||
|
||
if (!location |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (!location | |
if (location != null |
We should be explicit about our null checks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that should be if (location != null
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah good catch, suggestion fixed
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ons/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsModal.tsx
Outdated
Show resolved
Hide resolved
...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/AddEditDrawingsModal.tsx
Show resolved
Hide resolved
...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/AddEditDrawingsModal.tsx
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawings.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawings.tsx
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not all comments above are adressed
38aaa44
to
552ccf8
Compare
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Show resolved
Hide resolved
82505cc
to
2a4628c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New files/removed files also aren't reflected in the project file. Can you perform the necessary changes to the project file?
...ns/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/LocationDrawingsButton.tsx
Outdated
Show resolved
Hide resolved
...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Location/LocationDrawingsTable.tsx
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx
Outdated
Show resolved
Hide resolved
667daa8
to
8d96db0
Compare
8d96db0
to
3ea2dc6
Compare
7122008
to
09bd2c7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rebase threw away some changes made by other PR's
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/AssetConnection.tsx
Outdated
Show resolved
Hide resolved
function handleSelect(item) { | ||
history.push({ pathname: homePath + 'index.cshtml', search: '?name=Asset&AssetID=' + item.row.AssetID}) | ||
history.push({ pathname: homePath + 'index.cshtml', search: '?name=Asset&AssetID=' + item.row.AssetID }) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gcsantos-gpa I bet this conflicts with #606 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would yes
...s/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/PropertyUI/MeterLocationProperties.tsx
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx
Outdated
Show resolved
Hide resolved
Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx
Show resolved
Hide resolved
...Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/NewMeterWizard.tsx
Show resolved
Hide resolved
@gcsantos-gpa Do not merge please. |
Added the button to look for a location's drawings within the Asset Connection page.
Was already on the NMW.