Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nengyuanzhang committed Jun 28, 2024
2 parents 0cb8a2d + 0e70dec commit bcd34f2
Show file tree
Hide file tree
Showing 8 changed files with 2,742 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
- added svg actions to myems-api, myems-admin
- added phase_of_lifecycle to microgird
- added work order (preview) to myems-web
### Changed
- replaced svg with svg_id in microgrid
- replaced svg with svg_id in energy storage power station
Expand Down
6 changes: 5 additions & 1 deletion database/install/myems_system_db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,11 @@ VALUES
(1500,'Photovoltaic Power Station','/photovoltaicpowerstation',NULL,1),
(1501,'Photovoltaic Power Station Details','/photovoltaicpowerstationdetails',1500,1),
(1600,'Wind Farm','/windfarm',NULL,1),
(1601,'Wind Farm Details','/windfarmdetails',1600,1);
(1601,'Wind Farm Details','/windfarmdetails',1600,1),
(3000,'Work Order','/workorder',NULL,1),
(3001,'Work Order Installation','/workorder/installation',3000,1),
(3002,'Work Order Repair','/workorder/repair',3000,1),
(3003,'Work Order Installation','/workorder/inspection',3000,1);

-- ---------------------------------------------------------------------------------------------------------------------
-- Table `myems_system_db`.`tbl_meters`
Expand Down
7 changes: 7 additions & 0 deletions database/upgrade/upgrade4.7.0RC.sql
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ ALTER TABLE myems_system_db.tbl_energy_storage_power_stations DROP COLUMN svg;
ALTER TABLE myems_system_db.tbl_microgrids ADD `svg_id` BIGINT NOT NULL AFTER `serial_number`;
ALTER TABLE myems_system_db.tbl_microgrids DROP COLUMN svg;

INSERT INTO myems_system_db.tbl_menus (id,name,route, parent_menu_id,is_hidden)
VALUES
(3000,'Work Order','/workorder',NULL,1),
(3001,'Work Order Installation','/workorder/installation',3000,1),
(3002,'Work Order Repair','/workorder/repair',3000,1),
(3003,'Work Order Installation','/workorder/inspection',3000,1);

-- UPDATE VERSION NUMBER
UPDATE `myems_system_db`.`tbl_versions` SET version='4.7.0RC', release_date='2024-07-07' WHERE id=1;

Expand Down
Loading

0 comments on commit bcd34f2

Please sign in to comment.