Skip to content

public_model_functionality_fixes #295

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

Open
AteZenmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

public_model_functionality_fixes #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions _alp/Agents/Zero_Interface/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,11 @@ else if (previousClickedObjectType == OL_GISObjectType.BUILDING ||
}
List<OL_ChartTypes> selectedChartTypes_Economic = settings.resultsUISelectedChartTypes_Economic();

//Disable export functionality in profiles if not full access.
if(settings.isPublicModel() || user.GCAccessType != OL_UserGCAccessType.FULL){
uI_Results.f_enablePublicVersion(true);
}

//Disable summary button if summary is not selected
if(settings.showKPISummary() == null || !settings.showKPISummary()){
uI_Results.getCheckbox_KPISummary().setVisible(false);
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Interface/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2110,7 +2110,7 @@ gr_cablesLegend.setVisible(showCables);</ActionCode>
<TextColor>-16777216</TextColor>
<VisibleCode>cb_showFilterInterface.isEnabled()</VisibleCode>
<Enabled>true</Enabled>
<EnableExpression>!settings.isPublicModel() &amp;&amp; c_cbFilterOptions.size() &gt; 0</EnableExpression>
<EnableExpression>!settings.isPublicModel() &amp;&amp; user.GCAccessType == OL_UserGCAccessType.FULL &amp;&amp; c_cbFilterOptions.size() &gt; 0</EnableExpression>
<ActionCode>gr_filterInterface.setVisible(cb_showFilterInterface.isSelected());

if(!cb_showFilterInterface.isSelected()){
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Loader/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4836,7 +4836,7 @@ boolean f_getAccessOfSurveyGC(boolean dataSharingAgreed,Uuid companyUUID)
// If private model: several conditions allow access
return user.GCAccessType == OL_UserGCAccessType.FULL ||
dataSharingAgreed ||
user.accessibleCompanyIDs.contains(companyUUID.toString());
(user.GCAccessType == OL_UserGCAccessType.SPECIFIED && user.accessibleCompanyIDs.contains(companyUUID.toString()));
/*ALCODEEND*/}

boolean f_isLocatedInActiveNBH(double lat,double lon)
Expand Down
8 changes: 4 additions & 4 deletions _alp/Agents/tabEHub/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<TextColor>-16777216</TextColor>
<VisibleCode>//!zero_Interface.settings.isPublicModel()</VisibleCode>
<Enabled>true</Enabled>
<EnableExpression>!zero_Interface.settings.isPublicModel()</EnableExpression>
<EnableExpression>!zero_Interface.settings.isPublicModel() &amp;&amp; zero_Interface.user.GCAccessType == OL_UserGCAccessType.FULL</EnableExpression>
<ActionCode>/*
if (v_NFATOListener) {
// This should not be reachable anymore
Expand Down Expand Up @@ -176,7 +176,7 @@ else {
<EmbeddedIcon>false</EmbeddedIcon>
<TextColor>-16777216</TextColor>
<VisibleCode>!zero_Interface.settings.isPublicModel()</VisibleCode>
<Enabled>true</Enabled>
<Enabled>false</Enabled>
<ActionCode>for (GridConnection GC : zero_Interface.energyModel.f_getActiveGridConnections()) {
GC.v_liveConnectionMetaData.clearSharedCapacityManagers();
}
Expand Down Expand Up @@ -213,7 +213,7 @@ zero_Interface.f_resetSettings();</ActionCode>
<EmbeddedIcon>false</EmbeddedIcon>
<TextColor>-16777216</TextColor>
<Enabled>true</Enabled>
<EnableExpression>!zero_Interface.settings.isPublicModel()</EnableExpression>
<EnableExpression>!zero_Interface.settings.isPublicModel() &amp;&amp; zero_Interface.user.GCAccessType == OL_UserGCAccessType.FULL</EnableExpression>
<ActionCode>zero_Interface.f_startEnergyHubConfiguration();</ActionCode>
</BasicProperties>
<ExtendedProperties>
Expand Down Expand Up @@ -289,7 +289,7 @@ zero_Interface.f_resetSettings();</ActionCode>
<EmbeddedIcon>false</EmbeddedIcon>
<TextColor>-16777216</TextColor>
<Enabled>true</Enabled>
<EnableExpression>!zero_Interface.settings.isPublicModel()</EnableExpression>
<EnableExpression>!zero_Interface.settings.isPublicModel() &amp;&amp; zero_Interface.user.GCAccessType == OL_UserGCAccessType.FULL</EnableExpression>
<ActionCode>// First check if there are any save files, if there are none we display an error screen

zero_Interface.uI_EnergyHub.f_initializeUserSavedScenarios(zero_Interface.uI_EnergyHub.combobox_selectScenario);
Expand Down
8 changes: 4 additions & 4 deletions _alp/ModelResources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@
<Location>FILE_SYSTEM</Location>
</Resource>
<Resource>
<Id>1776931922142</Id>
<Path>vallum-production-861-41ea4ca-all.jar</Path>
<Id>1777376766232</Id>
<Path>icon_arrow.png</Path>
<ReferencedFromUserCode>false</ReferencedFromUserCode>
<Location>FILE_SYSTEM</Location>
</Resource>
<Resource>
<Id>1777376766232</Id>
<Path>icon_arrow.png</Path>
<Id>1780401378047</Id>
<Path>vallum-main-863-c779e37-all.jar</Path>
<ReferencedFromUserCode>false</ReferencedFromUserCode>
<Location>FILE_SYSTEM</Location>
</Resource>
Expand Down