Index: pro-violet-viettel/sourcecode/assets/css/custom.css
===================================================================
--- pro-violet-viettel/sourcecode/assets/css/custom.css	(revision 838)
+++ pro-violet-viettel/sourcecode/assets/css/custom.css	(revision 883)
@@ -311,2 +311,29 @@
 #form-field-province {padding-left: 0;}
 #form-field-district {padding-left: 0;}
+
+.file-upload {
+	position: relative;
+	overflow: hidden;
+	margin: 8px;
+	border-radius: 4px;
+}
+.file-upload input.upload {
+	position: absolute;
+	top: 0;
+	right: 0;
+	margin: 0;
+	padding: 0;
+	font-size: 20px;
+	cursor: pointer;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+#input-upload{
+	padding: 10px 12px;
+	font-size: 14px;
+	border: 1px solid #D8D8D8;
+
+}
+#btn-submit{
+	border-radius: 4px;
+}
Index: pro-violet-viettel/sourcecode/assets/js/admin/user.js
===================================================================
--- pro-violet-viettel/sourcecode/assets/js/admin/user.js	(revision 838)
+++ pro-violet-viettel/sourcecode/assets/js/admin/user.js	(revision 883)
@@ -89,5 +89,5 @@
                         {
                             $('#user-history').modal('hide');
-                            //alert("ÄÃ£ cáº­p nháº­t");
+                         
                             location.reload();
                         }
@@ -97,6 +97,5 @@
 }
 
-function checkSelecteDistrict(){
-	provinceId = $(".form-field-province").val();
+function checkSelectedDistrict(provinceId){
 	$.ajax({
         url: '/frontend/user/getDistrict/' + provinceId,
@@ -120,7 +119,6 @@
 }
 
-function changeEventProvince(){
+function changeEventProvince(provinceId){
 	$(".form-field-district").html("");
-	provinceId = $("#form-field-province").val();
 	$.ajax({
         url: '/frontend/user/getDistrict/' + provinceId,
@@ -139,2 +137,12 @@
     });
 }
+
+$(document).ready(function(){
+	$(".form-field-province").change(function(){
+		//alert("OK");
+		changeEventProvince();
+	});
+	if ($(".form-field-province").val() !== 'undefined'){
+		checkSelectedDistrict();
+	}
+});
Index: pro-violet-viettel/sourcecode/assets/js/collaborator/collaborator.js
===================================================================
--- pro-violet-viettel/sourcecode/assets/js/collaborator/collaborator.js	(revision 883)
+++ pro-violet-viettel/sourcecode/assets/js/collaborator/collaborator.js	(revision 883)
@@ -0,0 +1,61 @@
+$(document).on('change', '.upload', function() {
+		var path = this.value;
+		var filename = path.replace(/^.*\\/, "");
+		$("#input-upload").val(filename);
+});
+	
+$(document).ready(function(){
+	
+	$('#btn-submit').click(function(){
+		$("#charging").css('display', 'block');
+		$("#result").html("");
+		var data = new FormData($("#frm-upload")[0]);
+		//console.log(data);
+		$.ajax({
+			url: '/collaborator/user/upload',
+			type: 'POST',
+			data: data,
+			dataType: 'json',
+			mimeType: "multipart/form-data",
+			contentType: false,
+			processData: false,
+			cache: false,
+			success: function(data){
+				$("#charging").css('display', 'none');
+				$("#result").html(data);
+			},
+			error: function(data){
+			}
+		});
+		return false;
+	});
+	
+});
+
+function changePassword(collaborator_id)
+{
+	$('#passwd_old_err').html("");
+	$('#passwd_new_err').html("");
+	$('#confirm_passwd_new_err').html("");
+	$.ajax({
+		url: '/collaborator/collaborator/change_password/' + collaborator_id,
+		type: 'POST',
+		data: $("#frm-change-password").serialize(),
+		success: function (data, textStatus, jqXHR)
+		{	
+			console.log(data);
+			result = jQuery.parseJSON(data);
+			if (result.success == "1")
+			{   
+				$("#changePassSuccess").modal('show');
+			}
+			else
+			{
+				for (var key in result.errors)
+				{
+					$('#'+key).html(result.errors[key]);
+				}
+			}
+		}
+	});
+}
Index: pro-violet-viettel/sourcecode/assets/js/frontend/user.js
===================================================================
--- pro-violet-viettel/sourcecode/assets/js/frontend/user.js	(revision 838)
+++ pro-violet-viettel/sourcecode/assets/js/frontend/user.js	(revision 883)
@@ -45,5 +45,5 @@
 			
 			if ($(".form-field-province").val() !== 'undefined'){
-				checkSelecteDistrict();
+				checkSelectedDistrict();
 			}
 			$(".form-field-province").change(function(){
@@ -121,5 +121,4 @@
 		success: function (data, textStatus, jqXHR)
 		{	
-		console.log(data);
 			result = jQuery.parseJSON(data);
 			if (result.success == "1")
@@ -286,5 +285,5 @@
 }
 
-function checkSelecteDistrict(){
+function checkSelectedDistrict(){
 	provinceId = $(".form-field-province").val();
 	$.ajax({
@@ -309,8 +308,4 @@
 }
 
-if ($(".form-field-province").val() !== 'undefined'){
-	checkSelecteDistrict();
-}
-
 function changeEventProvince(){
 	$(".form-field-district").html("");
@@ -332,6 +327,10 @@
     });
 }
-
-$(".form-field-province").change(function(){
-	changeEventProvince();
+$(document).ready(function(){
+	if ($(".form-field-province").val() !== 'undefined'){
+		checkSelectedDistrict();
+	}
+	$(".form-field-province").change(function(){
+		changeEventProvince();
+	});
 });
