Merge branch 'develop'

CHANGELOG.md

@@ -11,7 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - updated tranlations of myems-admin
 - changed theme of BarChart and MultiTrendChart in myems-web
-- 
+- swapped cloumns color in dashboard of myems-web
+
 ### Fixed
 - fixed HTTPError Deprecated Warning in myems-api
 - fixed edit user issue in myems-api

myems-web/src/components/MyEMS/dashboard/Dashboard.js

@@ -453,10 +453,10 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
       <div className='card-deck'>
           <BarChart
             labels={barLabels}
-            data={thisYearBarList}
-            compareData={lastYearBarList}
-            title={t('This Year')}
-            compareTitle={t('The Same Period Last Year')}
+            data={lastYearBarList}
+            compareData={thisYearBarList}
+            title={t('The Same Period Last Year')}
+            compareTitle={t('This Year')}
             footnote={t('Per Unit Area')}
             footunit={"/M²"} >
           </BarChart>