Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

792: Add projects count to project types in Dashboard Project #22

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

792: Add projects count to project types in Dashboard Project #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b43d0f
fix for 792: Add projects count to project types in Dashboard Project…
niksj Apr 10, 2016
06f826a
Update CreateProjectPresenter.java
niksj Apr 10, 2016
8d5bca7
Update ProjectModelTypeField.java
niksj Apr 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 32 additions & 24 deletions src/main/java/org/sigmah/client/ui/presenter/CreateProjectPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
package org.sigmah.client.ui.presenter;

/*
* #%L
* Sigmah
* %%
* Copyright (C) 2010 - 2016 URD
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/

package org.sigmah.client.ui.presenter;
/*
* #%L
* Sigmah
* %%
* Copyright (C) 2010 - 2016 URD
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/

import java.util.Date;
import java.util.HashMap;
Expand Down Expand Up @@ -86,6 +86,9 @@
*/
@Singleton
public class CreateProjectPresenter extends AbstractPagePresenter<CreateProjectPresenter.View> {
public NGO.counter=0;
public FUNDING.counter=0;
public LOCAL_PARTNER.counter=0;

/**
* View interface.
Expand Down Expand Up @@ -433,6 +436,11 @@ public void componentSelected(ButtonEvent ce) {
}

});

if(type==NGO){NGO.counter++; }
else if(type==FUNDING){FUNDING.counter++;}
else if(type==LOCAL_PARTNER){LOCAL_PARTNER.counter++;}
else{}

}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/sigmah/client/ui/widget/form/ProjectModelTypeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import org.sigmah.client.ui.res.icon.dashboard.funding.FundingIconProvider;
import org.sigmah.client.ui.res.icon.dashboard.funding.FundingIconProvider.IconSize;
import org.sigmah.client.ui.presenter;
import org.sigmah.client.util.ClientUtils;
import org.sigmah.shared.dto.referential.ProjectModelType;

Expand Down Expand Up @@ -104,7 +105,7 @@ public ProjectModelTypeField(final String fieldLabel, final boolean mandatory, f
icon.getElement().getStyle().setMarginTop(-2, Unit.PX);
icon.getElement().getStyle().setPaddingRight(6, Unit.PX);

radio.setBoxLabel(icon.toString() + ProjectModelType.getName(projectModelType));
radio.setBoxLabel(icon.toString() + ProjectModelType.getName(projectModelType) + "(" + ProjectModelType.counter + ")");

radioGroup.add(radio);
radios.put(projectModelType, radio);
Expand Down