Skip to content

Commit

Permalink
Merge pull request #339 from devgateway/feature/OCMAKU-363
Browse files Browse the repository at this point in the history
OCMAKU-363 Move the Percentage of plans with invitations to bid chart
  • Loading branch information
lilitk authored Oct 14, 2019
2 parents bee37a4 + 81e7678 commit 5e58f6d
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions ui/oce-standalone/oceMakueni.jsx
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ import OverviewTab from '../oce/tabs/overview';
import LocationTab from '../oce/tabs/location';
import CompetitivenessTab from '../oce/tabs/competitiveness';
import EfficiencyTab from '../oce/tabs/efficiency';
import EProcurementTab from '../oce/tabs/e-procurement';
import { fetchJson } from '../oce/tools';
import Header from '../oce/layout/header';

@@ -16,7 +15,7 @@ class OCEMakueni extends OCApp {
// this.registerTab(OCEDemoLocation);
this.registerTab(CompetitivenessTab);
this.registerTab(EfficiencyTab);
this.registerTab(EProcurementTab);
//this.registerTab(EProcurementTab);
}

fetchBidTypes() {
2 changes: 1 addition & 1 deletion ui/oce/tabs/e-procurement.jsx
Original file line number Diff line number Diff line change
@@ -9,6 +9,6 @@ class EProcurement extends Tab {

EProcurement.icon = 'eprocurement';
//EProcurement.visualizations = [PercentEBid, NrEbid, PercentWithTenders];
EProcurement.visualizations = [PercentWithTenders];
EProcurement.visualizations = [];

export default EProcurement;
3 changes: 2 additions & 1 deletion ui/oce/tabs/efficiency.jsx
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ import Cancelled from '../visualizations/charts/cancelled';
import NrCancelled from '../visualizations/charts/nr-cancelled';
import TotalAmountsByItem from '../visualizations/charts/total-amounts-by-item';
import BidsByItem from '../visualizations/charts/bids-by-item';
import PercentWithTenders from '../visualizations/charts/percent-with-tenders';

class Efficiency extends Tab {
static getName(t) {
@@ -12,6 +13,6 @@ class Efficiency extends Tab {
}

Efficiency.icon = 'efficiency';
Efficiency.visualizations = [BidPeriod, TotalAmountsByItem, BidsByItem, Cancelled, NrCancelled];
Efficiency.visualizations = [BidPeriod, TotalAmountsByItem, BidsByItem, Cancelled, NrCancelled, PercentWithTenders];

export default Efficiency;

0 comments on commit 5e58f6d

Please sign in to comment.