* Tuning email template

* Add copyright message for public release

Author: Hai Nguyen

mycollab-app-community/src/main/java/com/esofthead/mycollab/jetty/CommunityServerRunner.java

@@ -16,8 +16,11 @@
  */
 package com.esofthead.mycollab.jetty;
 
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;
 
+import com.esofthead.mycollab.servlet.SetupServlet;
+
 /**
  * 
  * @author MyCollab Ltd.
@@ -33,6 +36,7 @@ public WebAppContext buildContext(String baseDir) {
 		webAppContext.setClassLoader(Thread.currentThread()
 				.getContextClassLoader());
 		webAppContext.setResourceBase(baseDir);
+		webAppContext.addServlet(new ServletHolder(new SetupServlet()), "/setup");
 		return webAppContext;
 	}
 

mycollab-config/src/main/java/com/esofthead/mycollab/configuration/MyCollabAssets.java

@@ -1,3 +1,19 @@
+/**
+ * This file is part of mycollab-config.
+ *
+ * mycollab-config 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.
+ *
+ * mycollab-config 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 mycollab-config.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.esofthead.mycollab.configuration;
 
 import com.esofthead.mycollab.core.DeploymentMode;

mycollab-core/src/main/java/com/esofthead/mycollab/core/utils/DateTimeUtils.java

@@ -66,9 +66,20 @@ public static Date trimHMSOfDate(Date value) {
 	}
 
 	public static Date convertDateByString(String strDate, String format) {
-		if (strDate != null && !strDate.equals("") && format != null
-				&& !format.equals("")) {
-			SimpleDateFormat formatter = new SimpleDateFormat(format);
+		if (strDate != null && !strDate.equals("")) {
+			try {
+				SimpleDateFormat formatter = new SimpleDateFormat(format);
+				return formatter.parse(strDate);
+			} catch (ParseException e) {
+				log.error("Error while parse date", e);
+			}
+		}
+		return new Date();
+	}
+
+	public static Date convertDateByString(String strDate,
+			SimpleDateFormat formatter) {
+		if (strDate != null && !strDate.equals("")) {
 			try {
 				return formatter.parse(strDate);
 			} catch (ParseException e) {
@@ -78,6 +89,12 @@ public static Date convertDateByString(String strDate, String format) {
 		return new Date();
 	}
 
+	public static String converToStringWithUserTimeZone(String dateVal,
+			String userTimeZone) {
+		Date date = convertDateByFormatW3C(dateVal);
+		return converToStringWithUserTimeZone(date, userTimeZone);
+	}
+
 	/**
 	 * 
 	 * @param strDate

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/ui/CrmGenericPresenter.java

@@ -1,3 +1,19 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.esofthead.mycollab.mobile.module.crm.ui;
 
 import com.esofthead.mycollab.mobile.mvp.AbstractPresenter;

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/view/account/AccountAddPresenter.java

@@ -1,3 +1,19 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.esofthead.mycollab.mobile.module.crm.view.account;
 
 import com.esofthead.mycollab.common.UrlEncodeDecoder;

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/view/account/AccountAddView.java

@@ -1,3 +1,19 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.esofthead.mycollab.mobile.module.crm.view.account;
 
 import com.esofthead.mycollab.module.crm.domain.SimpleAccount;

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/view/account/AccountAddViewImpl.java

@@ -1,3 +1,19 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.esofthead.mycollab.mobile.module.crm.view.account;
 
 import com.esofthead.mycollab.mobile.form.view.DynaFormLayout;

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/view/account/AccountEditFormFieldFactory.java

@@ -0,0 +1,76 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.esofthead.mycollab.mobile.module.crm.view.account;
+
+import com.esofthead.mycollab.mobile.module.user.ui.components.ActiveUserComboBox;
+import com.esofthead.mycollab.module.crm.domain.Account;
+import com.esofthead.mycollab.vaadin.ui.AbstractBeanFieldGroupEditFieldFactory;
+import com.esofthead.mycollab.vaadin.ui.CountryComboBox;
+import com.esofthead.mycollab.vaadin.ui.GenericBeanForm;
+import com.esofthead.mycollab.vaadin.ui.IndustryComboBox;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+
+public class AccountEditFormFieldFactory<B extends Account> extends
+		AbstractBeanFieldGroupEditFieldFactory<B> {
+
+	private static final long serialVersionUID = 1L;
+
+	public AccountEditFormFieldFactory(GenericBeanForm<B> form) {
+		super(form);
+	}
+
+	AccountEditFormFieldFactory(GenericBeanForm<B> form, boolean isValidateForm) {
+		super(form, isValidateForm);
+	}
+
+	@Override
+	protected Field<?> onCreateField(Object propertyId) {
+		if ("type".equals(propertyId)) {
+			AccountTypeComboBox accountTypeBox = new AccountTypeComboBox();
+			return accountTypeBox;
+		} else if ("industry".equals(propertyId)) {
+			IndustryComboBox accountIndustryBox = new IndustryComboBox();
+			return accountIndustryBox;
+		} else if ("assignuser".equals(propertyId)) {
+			ActiveUserComboBox userBox = new ActiveUserComboBox();
+			userBox.select(attachForm.getBean().getAssignuser());
+			return userBox;
+		} else if ("description".equals(propertyId)) {
+			TextArea textArea = new TextArea("", "");
+			textArea.setNullRepresentation("");
+			return textArea;
+		} else if ("billingcountry".equals(propertyId)
+				|| "shippingcountry".equals(propertyId)) {
+			CountryComboBox billingCountryComboBox = new CountryComboBox();
+			return billingCountryComboBox;
+		} else if (propertyId.equals("accountname")) {
+			TextField tf = new TextField();
+			if (isValidateForm) {
+				tf.setNullRepresentation("");
+				tf.setRequired(true);
+				tf.setRequiredError("Please enter an Account Name");
+			}
+
+			return tf;
+		}
+
+		return null;
+	}
+
+}

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/crm/view/account/AccountTypeComboBox.java

@@ -0,0 +1,47 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
+ * This file is part of mycollab-web.
+ *
+ * mycollab-web 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.
+ *
+ * mycollab-web 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 mycollab-web.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.esofthead.mycollab.mobile.module.crm.view.account;
+
+import com.esofthead.mycollab.module.crm.CrmDataTypeFactory;
+import com.esofthead.mycollab.vaadin.ui.ValueComboBox;
+
+public class AccountTypeComboBox extends ValueComboBox {
+	private static final long serialVersionUID = 1L;
+
+	public AccountTypeComboBox() {
+		super();
+		setCaption(null);
+		this.loadData(CrmDataTypeFactory.getAccountTypeList());
+	}
+
+}

mycollab-mobile/src/main/java/com/esofthead/mycollab/mobile/module/user/ui/components/ActiveUserComboBox.java

@@ -0,0 +1,98 @@
+/**
+ * This file is part of mycollab-mobile.
+ *
+ * mycollab-mobile 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.
+ *
+ * mycollab-mobile 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 mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
+ * This file is part of mycollab-web.
+ *
+ * mycollab-web 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.
+ *
+ * mycollab-web 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 mycollab-web.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.esofthead.mycollab.mobile.module.user.ui.components;
+
+import java.util.List;
+
+import com.esofthead.mycollab.core.arguments.NumberSearchField;
+import com.esofthead.mycollab.core.arguments.SearchField;
+import com.esofthead.mycollab.core.arguments.SearchRequest;
+import com.esofthead.mycollab.core.arguments.SetSearchField;
+import com.esofthead.mycollab.module.billing.RegisterStatusConstants;
+import com.esofthead.mycollab.module.user.domain.SimpleUser;
+import com.esofthead.mycollab.module.user.domain.criteria.UserSearchCriteria;
+import com.esofthead.mycollab.module.user.service.UserService;
+import com.esofthead.mycollab.spring.ApplicationContextUtil;
+import com.esofthead.mycollab.vaadin.AppContext;
+import com.esofthead.mycollab.vaadin.ui.UserAvatarControlFactory;
+import com.vaadin.ui.ComboBox;
+
+/**
+ * 
+ * @author MyCollab Ltd.
+ * @since 2.0
+ * 
+ */
+public class ActiveUserComboBox extends ComboBox {
+
+	private static final long serialVersionUID = 1L;
+
+	@SuppressWarnings("unchecked")
+	public ActiveUserComboBox() {
+		super();
+		this.setItemCaptionMode(ItemCaptionMode.EXPLICIT);
+
+		UserSearchCriteria criteria = new UserSearchCriteria();
+		criteria.setSaccountid(new NumberSearchField(SearchField.AND,
+				AppContext.getAccountId()));
+		criteria.setRegisterStatuses(new SetSearchField<String>(
+				SearchField.AND,
+				new String[] { RegisterStatusConstants.ACTIVE }));
+
+		UserService userService = ApplicationContextUtil
+				.getSpringBean(UserService.class);
+		List<SimpleUser> userList = userService
+				.findPagableListByCriteria(new SearchRequest<UserSearchCriteria>(
+						criteria, 0, Integer.MAX_VALUE));
+		loadUserList(userList);
+
+	}
+
+	public ActiveUserComboBox(List<SimpleUser> userList) {
+		super();
+		this.setItemCaptionMode(ItemCaptionMode.EXPLICIT);
+		loadUserList(userList);
+	}
+
+	private void loadUserList(List<SimpleUser> userList) {
+
+		for (SimpleUser user : userList) {
+			this.addItem(user.getUsername());
+			this.setItemCaption(user.getUsername(), user.getDisplayName());
+			this.setItemIcon(
+					user.getUsername(),
+					UserAvatarControlFactory.createAvatarResource(
+							user.getAvatarid(), 16));
+		}
+	}
+}