Skip to content

fix: export 104 csv feature update #364

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 19, 2025
Merged

fix: export 104 csv feature update #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6fdad7
fix: Change signal type logic and name in export 104 plugin
noraeb Mar 13, 2025
dd33278
test: Update unit test
noraeb Mar 13, 2025
11d098e
Merge branch 'main' into fix/104-feature-update
noraeb Mar 19, 2025
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
2 changes: 1 addition & 1 deletion packages/plugins/src/menu/Export104.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default class Export104 extends LitElement {
if (signal104Data.isMonitorSignal) {
line.push(signal104Data.ioa ?? '', '');
} else {
line.push('', signal104Data.ioa ?? '');
line.push(signal104Data.ioa ?? '', signal104Data.ioa ?? '');
}

lines.push(line);
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/src/menu/export104/foundation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface ExtractSignal104Result {

enum SignalType {
Monitor,
Control,
MonitorAndControl,
Unknown
}

Expand Down Expand Up @@ -88,7 +88,7 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac

const substationName = parentSubstation.getAttribute('name');

const name = `${substationName}${voltageLevelName}${bayName}${doiDesc}`;
const name = `${substationName} ${voltageLevelName} ${bayName} ${doiDesc}`;

return {
signal: {
Expand All @@ -112,7 +112,7 @@ function getSignalType(tiString: string): SignalType {
if ((ti >= 1 && ti <= 21) || (ti >= 30 && ti <= 40)) {
return SignalType.Monitor;
} else if ((ti >= 45 && ti <= 51) || (ti >= 58 && ti <= 64)) {
return SignalType.Control;
return SignalType.MonitorAndControl;
} else {
return SignalType.Unknown;
}
Expand Down
10 changes: 5 additions & 5 deletions packages/plugins/test/unit/menu/104Export/foundation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@ describe('Export104 foundation', () => {

const expectedSignals = [
{
name: 'S1F2V105Control1',
name: 'S1 F2 V105 Control1',
signalNumber: '3001',
isMonitorSignal: false,
ioa: '1053001',
ti: '50'
},
{
name: 'S1F2V105Control2',
name: 'S1 F2 V105 Control2',
signalNumber: '3002',
isMonitorSignal: false,
ioa: '1053002',
ti: '64'
},
{
name: 'S1F1V104Behavior',
name: 'S1 F1 V104 Behavior',
signalNumber: '2001',
isMonitorSignal: true,
ioa: '1042001',
ti: '35'
},
{
name: 'S1F1V104Behavior',
name: 'S1 F1 V104 Behavior',
signalNumber: '2002',
isMonitorSignal: true,
ioa: '1042002',
ti: '35'
},
{
name: 'S1F1V103Behavior',
name: 'S1 F1 V103 Behavior',
signalNumber: '1003',
isMonitorSignal: true,
ioa: '1031003',
Expand Down