<commit_before><<<<<<< HEAD
app.controller('UserController', function ($scope, userService) {

    init();

    $scope.user = {};

    function init() {}

    $scope.showModalAddUser = function (e) {
        e.preventDefault();
        $scope.user = {};
        $scope.user.title = '<NAME>';
        $('#modal-user').modal();
    }

    $scope.saveUser = function () {
        var response = $scope.user._id ? userService.edit($scope.user) : userService.save($scope.user);
        response.then(function (data) {
            loadDataInformation();
            toastr.success("Satisfactoriamente Guardado");
        });
        $('#modal-user').modal('hide');
    }

    function loadDataInformation() {
        var response = userService.getUsers();
        response.then(function (users) {
            $scope.users = users;
        });
    }

    $scope.showModalEditUser = function (e, user) {
        e.preventDefault();
        $scope.user = angular.copy(user);

        $scope.user.title = 'Editar Usuario';
        $('#modal-user').modal();
    }



    $scope.deleteUser = function () {
        var response = userService.remove($scope.user._id);
        response.then(function (data) {
            $('#modal-confirmation').modal('hide');
            loadDataInformation();
            toastr.success("Satisfactoriamente Eliminado");;
        });
    }


=======
app.controller('UserController', function ($scope) {

	init();

	$scope.user = {};

	function init() {
	}

	$scope.showModalAddUser = function (e) {
		e.preventDefault();
		$scope.user = {};
		$scope.user.title = '<NAME>';
		$('#modal-user').modal();
	}

	$scope.addUser = function () {
		$scope.user.UserId = new Date().getMilliseconds();
		$scope.user.push($scope.user);
		$('#modal-user').modal('hide');
	}

	$scope.showModalEditUser = function (e, user) {
		e.preventDefault();
		$scope.user = angular.copy(user);

		$scope.user.title = 'Editar Usuario';
		$('#modal-user').modal();
	}

	$scope.editUser = function (user) {

	}

	$scope.deleteUser = function (e, user) {
		e.preventDefault();
		$scope.user = product;
		$('#modal-confirmation').modal();
	}

	$scope.users = [{
		UserId: 1,
		Name: '<NAME>',
		LastName: 'Suarez 001',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 2,
		Name: '<NAME>',
		LastName: 'Suarez 002',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 3,
		Name: '<NAME>',
		LastName: 'Suarez 003',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 4,
		Name: '<NAME>',
		LastName: 'Suarez 004',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 5,
		Name: '<NAME>',
		LastName: 'Suarez 005',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }];
>>>>>>> ASAF-GITHUB/master

});<commit_msg>chages user<commit_after>
app.controller('UserController', function ($scope, userService) {

    init();

    $scope.user = {};

    function init() {}

    $scope.showModalAddUser = function (e) {
        e.preventDefault();
        $scope.user = {};
        $scope.user.title = 'Nuevo Usuario';
        $('#modal-user').modal();
    }

    $scope.saveUser = function () {
        var response = $scope.user._id ? userService.edit($scope.user) : userService.save($scope.user);
        response.then(function (data) {
            loadDataInformation();
            toastr.success("Satisfactoriamente Guardado");
        });
        $('#modal-user').modal('hide');
    }

    function loadDataInformation() {
        var response = userService.getUsers();
        response.then(function (users) {
            $scope.users = users;
        });
    }

    $scope.showModalEditUser = function (e, user) {
        e.preventDefault();
        $scope.user = angular.copy(user);

        $scope.user.title = 'Editar Usuario';
        $('#modal-user').modal();
    }



    $scope.deleteUser = function () {
        var response = userService.remove($scope.user._id);
        response.then(function (data) {
            $('#modal-confirmation').modal('hide');
            loadDataInformation();
            toastr.success("Satisfactoriamente Eliminado");;
        });
    }


app.controller('UserController', function ($scope) {

	init();

	$scope.user = {};

	function init() {
	}

	$scope.showModalAddUser = function (e) {
		e.preventDefault();
		$scope.user = {};
		$scope.user.title = 'Nuevo Usuario';
		$('#modal-user').modal();
	}

	$scope.addUser = function () {
		$scope.user.UserId = new Date().getMilliseconds();
		$scope.user.push($scope.user);
		$('#modal-user').modal('hide');
	}

	$scope.showModalEditUser = function (e, user) {
		e.preventDefault();
		$scope.user = angular.copy(user);

		$scope.user.title = 'Editar Usuario';
		$('#modal-user').modal();
	}

	$scope.editUser = function (user) {

	}

	$scope.deleteUser = function (e, user) {
		e.preventDefault();
		$scope.user = product;
		$('#modal-confirmation').modal();
	}

	$scope.users = [{
		UserId: 1,
		Name: '<NAME>',
		LastName: 'Suarez 001',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 2,
		Name: '<NAME>',
		LastName: '<NAME>',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 3,
		Name: '<NAME>',
		LastName: 'Suarez 003',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 4,
		Name: '<NAME>',
		LastName: 'Suarez 004',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }, {
		UserId: 5,
		Name: '<NAME>',
		LastName: 'Suarez 005',
		EnterDate: '10/04/2015',
		Role: 'adm',
		Password:'<PASSWORD>'
    }];

});
{'fraction_non_alphanumeric': 0.19675313216869597, 'fraction_numerical': 0.020645844362096346, 'mean_word_length': 2.80658159838818, 'pattern_counts': {'":': 0, '<': 33, '<?xml version=': 0, '>': 33, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '669121', 'n_tokens_mistral': 2113, 'n_tokens_neox': 1932, 'n_words': 336}