Merge develop with master #3043
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…on_Scada_LTS_in_url2 #2460 Change ScadaBR on Scada-LTS in url -
…to_set_the_background_resolution #2015 it is not possible to set the background resolution:
Added: - In ReportChartCreator.java, variables that control height (of legend and consolidated chart) for every point added to report - calculateHeightConsolidatedChart method to calculate height needed for consolidated graph in ImageChartUtils.java - CalculateConsolidatedChartHeightTest.java and CalculateConsolidatedChartHeightExceptionTest.java for testing calculateHeightConsolidatedChart method - ReplaceMacroStringUtilsWithProdParametersTest.java for testing RepalceMacro method - getters inside PointInfo in ReportInstancePointDAO.java Changed: - In ReportInstancePointDAO.java how names of data source and data point are passed, now they are truncated before passing them to ReportChartCreator - insert method in ReportInstancePointDAO.java so now it takes less parameters (uses only pointInfo now for all necessary data point information) - truncate method to abbreviateMiddle for truncating data source and data point names so they fit report chart - Deprecated truncate method in StringUtils.java and truncate method tests in StringUtilsTest.java
Changed length of displayed names to shorter in reports so graphs in statistics won't get stretched
Added: - calculatePointNameForReport method for for each point graph names to make them parse correctly - Truncate parameterized Junit tests - Suites to group up tests for StringUtils and ImageChartUtils Changed: - Length of point and data source name so they are truncated to length that database accept - Way of truncating names, now "..." are added at the end of extended name
- Moved calculatePointNameForReport method to ImageChartUtils.java - Added getExtendedNameForReport() in ReportPointInfo.java - Changed getExtendedName() method to getExtendedNameForReport() so graphs will have correct name length
Moved xid validations to validate() method for each component: - Compound Event - Event Handler - Mailing List - Maintenance Event - Point Link - Scheduled Event
Removed unused imports left from previous commits
…r datapoint #2769 - Added similar duplicate removal system for event text renderers as for text renderers
- Using xid and id instead of getXid() and getId() in validateXid() methods
…n_error_handling #2758 Fixed xid validation error handling
…ange_formats_when_applying_format_from_another_datapoint Fix/ Risk of duplicate range formats when applying format from another datapoint #2769
…ded_phase_to_force_Meta_Data_Source_recalculation_for_Change_Context
…Context Added condition which checks if point value changed while point was disabled
- Replaced if condition with lambda expression
…operties_Examples Feature/#2815 update point properties examples
…ificationException_in_MonitoredValues #2628 Fixed ConcurrentModificationException in MonitoredValues:
…d point values by id desc if ts is same;
- corrected includeTestsMatching from ImageChartUtilsTestSuite to ImageChartUtilsTestsSuite (build.gradle) - corrected tests, added cases, and renamed: CalculateLinesImageChartUtilsTest, CalculateLinesImageChartUtilsExceptionTest, and corrected tests, added cases for: TruncateStringUtilsExceptionTest, TruncateStringUtilsTest and renamed test: ReplaceMacroStringUtilsTest; - refactoring, corrected method ImageChartUtils.calculateHeightConsolidatedChart, renamed on calculateHeightChart, removed throws IllegalArgumentException, extracted method calculateLinesNumber for calculate only lines number, corrected algorithm; - corrected state: LINE_LENGTH_IN_LEGEND_LIMIT=156, and DATA_POINT_EXTENDED_NAME_LENGTH_LIMIT=54; - renamed state: IMAGE_WIDTH_PIXELS, IMAGE_HEIGHT_PIXELS, POINT_LABEL_HEIGHT_IN_LEGEND_PIXELS, LINE_LENGTH_IN_LEGEND_LIMIT, DATA_POINT_EXTENDED_NAME_LENGTH_LIMIT, POINT_IMAGE_WIDTH_PIXELS, POINT_IMAGE_HEIGHT_PIXELS; - corrected method ReportChartCreator.createContent; - not use deprecated method reportInstancePointDAO.insert; - corrected method StringUtils.truncate;
…space_in_reports_screen2
- corrected test TruncateStringUtilsTest
…ch_space_in_reports_screen2' into fix/#2726_Legend_occupies_too_much_space_in_reports_screen2
…ion_Change_Point_Value_By_User
- removed MangoPointValuesWithChangeOwner from imports in PointValueService; (this import appeared in conflict resolution)
…cted annotation for other source user
- change error on debug logging level in ImageChartUtils.calculateLinesNumber; - separate logic and app cases: CalculateLinesImageChartUtilsAppCaseTest, CalculateLinesImageChartUtilsLogicCaseTest; - added cases to test TruncateStringUtilsExceptionTest
- change error on debug logging level in ImageChartUtils.calculateLinesNumber; - separate logic and app cases: CalculateLinesImageChartUtilsAppCaseTest, CalculateLinesImageChartUtilsLogicCaseTest; - added cases to test TruncateStringUtilsExceptionTest
…een2' of /~https://github.com/SCADA-LTS/Scada-LTS into fix/#2726_Legend_occupies_too_much_space_in_reports_screen2
…Context - Instead of using execute(PointValueTime newValue, boolean initializeMode) we now use execute(long runtime, List<Integer> sourceIds, boolean initializeMode) for refreshing value when initializing point - fixed if condition, instead of comparing pointValues now compares actual values
- corrected DataPointSynchronizedRT; - corrected PointValueStateUtils.isSetPoint include source: User, PointLinkSetPointSource, RestApiSource; - corrected PointValueCacheTest;
…ator_test_fields_validation_in_Modbus_IP #2917 Added Point locator test fields validation in Modbus IP
- Changed getResourceBundle() method
…ixed links in: - PointLinks/index.vue; - CompoundEventDetectors/index.vue; - EventHandlers/index.vue; - MaintenanceEvents/index.vue; - ScheduledEvents/index.vue; - Reports/index.vue; - System/ImportExport/index.vue; - System/Publishers/index.vue;
…ixed links in: - SQL/index.vue;
…e_in_watchlist_view #2896 Fixed alert language in watchlist view
…to_work_in_address_without_name_as_ROOT
…ge_causing_system_exception_in_graphical_view_edit #2932 Fixed French language causing system exception in graphical vie…
…ded_an_infinite_loop_in_execute_for_HttpSenderRT2 #2708 Fixed 'Narrowly avoided an infinite loop in execute' for HttpSe…
- fixed style for img.ptr, moved from old common.css; - added class 'row' to tr in generate table point list in dataSourceEdit.jsp;
- corrected td.width
- corrected td.width to 10%; - fixed style for: common_DARK.css, common_DEFAULT.css, common_MODERN.css;
…nt_on_data_point_list2 #2926 Fixed icons placement on data point list2:
…ctive_events_by_handlers #2696 Generation of active events by handlers:
…to_work_in_address_without_name_as_ROOT
…and_database_termination_sequence
…rected BackgroundProcessing.java
…ation_to_work_in_address_without_name_as_ROOT #2864 Adapting application to work in address without name as ROOT:
…rected formatting Common.java
…ority_and_database_termination_sequence Fix/#2930 fixed high pool priority and database termination sequence
- low-priority.keep-alive-time to 1; - low-priority.time-unit-enum-value to SECONDS; - medium-priority.core-pool-size to 4;
- removed css class row in table pointList;
- added validation for timeout;
- Removed import unused js file; - Loaded App component if open new ui; - Fixed double initialization setInterval for timeToCheckRefresh; - Added in log name loading vue component; - Fixed path to favicon.ico;
- fixed live-alarms-component;
- fixed ScadaObjectIdentifier;
#2944 Fixed create WatchList:
…ary_api_calls #2000 Removal of unnecessary api calls:
Release/2.7.8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.