upgraded version number to 3.3.0

CHANGELOG.md

@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
+
+## [v3.3.0] - 2023-05-21
+### Added
 - Added captcha to myems-web login form
 - Added captcha to myems-admin login form
 - Added higher limit and lower limit to tbl_points in database
@@ -1245,7 +1255,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
-[Unreleased]: https://github.com/MyEMS/myems/compare/v3.2.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v3.3.0...HEAD
+[3.3.0]: https://github.com/MyEMS/myems/compare/v3.3.0...v3.2.0
 [3.2.0]: https://github.com/MyEMS/myems/compare/v3.1.0...v3.2.0
 [3.1.0]: https://github.com/MyEMS/myems/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/MyEMS/myems/releases/tag/v3.0.0

database/install/myems_system_db.sql

@@ -1331,7 +1331,7 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '3.3.0RC', '2023-05-18');
+(1, '3.3.0', '2023-05-21');
 
 COMMIT;
 

database/upgrade/upgrade3.3.0RC.sql → database/upgrade/upgrade3.3.0.sql

 -- ---------------------------------------------------------------------------------------------------------------------
 -- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
--- THIS SCRIPT IS ONLY FOR UPGRADING 3.2.0 TO 3.3.0RC
+-- THIS SCRIPT IS ONLY FOR UPGRADING 3.2.0 TO 3.3.0
 -- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
 -- ---------------------------------------------------------------------------------------------------------------------
 
@@ -11,6 +11,6 @@ ALTER TABLE `myems_system_db`.`tbl_points` ADD `lower_limit` DECIMAL(18, 3) NULL
 ALTER TABLE `myems_system_db`.`tbl_points` ADD `higher_limit` DECIMAL(18, 3) NULL COMMENT 'Used in FDD Service' AFTER `low_limit`;
 
 -- UPDATE VERSION NUMBER
-UPDATE `myems_system_db`.`tbl_versions` SET version='3.3.0RC', release_date='2023-05-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='3.3.0', release_date='2023-05-21' WHERE id=1;
 
 COMMIT;
\ No newline at end of file

myems-admin/views/common/footer-login.html

 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v3.2.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.3.0 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>

myems-admin/views/common/footer.html

@@ -3,6 +3,6 @@
         <strong><a href="https://myems.io">https://myems.io</a></strong>
     </div>
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v3.2.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.3.0</strong>
     </div>
 </div>

myems-aggregation/version.txt

-3.2.0
\ No newline at end of file
+3.3.0
\ No newline at end of file

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v3.2.0',
-                  "release-date": '2023-03-31',
+        result = {"version": 'MyEMS v3.3.0',
+                  "release-date": '2023-05-21',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)
 

myems-cleaning/version.txt

-3.2.0
\ No newline at end of file
+3.3.0
\ No newline at end of file

myems-modbus-tcp/version.txt

-3.2.0
\ No newline at end of file
+3.3.0
\ No newline at end of file

myems-normalization/version.txt

-3.2.0
\ No newline at end of file
+3.3.0
\ No newline at end of file

myems-web/package.json

 {
   "name": "myems",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

myems-web/src/config.js

-export const version = '3.2.0';
+export const version = '3.3.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';