Skip to content
GitLab
Commit cfc17f6c authored by walid chafai's avatar walid chafai
Browse files

Revert "correction des erreurs" 

This reverts commit 8a8ee278
parent dea503d0
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore 100644 → 100755
View file @ cfc17f6c
# OS X
*.DS_Store
._*
# Wakanda data
*.waData
# Wakanda preferences
*.waPreferences
# Wakanda log
*.waLog
*/Logs
studio_log*
# Wakanda code symbols
*.waSym
*.waSymData
# Wakanda index
*.waIndex
*.waIndx
*.Match
# Wakanda User and Group cache
*.cacheUAG
# Wakanda breakpoints
breakpoints.json
# Wakanda session ID cache
sessionID.json
# Wakanda backup
*.waBackup
# Wakanda Remote Model Cache
*.waRemoteModel
# temporary files
*.swp
*.swo
# mobile
*/mobile/.sass-cache
*/mobile/plugins
# mobile/web
#node_modules/
*.log
#data.WakTDef
*.WakTDef
# cache sass
*/web/assets/.sass-cache
.idea
# OS X
*.DS_Store
._*
# Wakanda data
*.waData
# Wakanda preferences
*.waPreferences
# Wakanda log
*.waLog
*/Logs
studio_log*
# Wakanda code symbols
*.waSym
*.waSymData
# Wakanda index
*.waIndex
*.waIndx
*.Match
# Wakanda User and Group cache
*.cacheUAG
# Wakanda breakpoints
breakpoints.json
# Wakanda session ID cache
sessionID.json
# Wakanda backup
*.waBackup
# Wakanda Remote Model Cache
*.waRemoteModel
# temporary files
*.swp
*.swo
# mobile
*/mobile/.sass-cache
*/mobile/plugins
# mobile/web
#node_modules/
*.log
#data.WakTDef
*.WakTDef
# cache sass
*/web/assets/.sass-cache
.idea
#*/*/bower_components
\ No newline at end of file
Adullact Solution/Adullact.Hamza.waPreferences deleted 100644 → 0
View file @ dea503d0
<?xml version="1.0" encoding="UTF-8"?><configuration editors="{&quot;tabbedWindows&quot;:[],&quot;solutionExplorer&quot;:{&quot;left&quot;:{&quot;tabs&quot;:[{&quot;kind&quot;:&quot;extensionView&quot;,&quot;path&quot;:&quot;../Adullact/web/app/APICall/DGFIP/apiCall.dgfip.html&quot;,&quot;name&quot;:&quot;apiCall.dgfip.html&quot;,&quot;showOutline&quot;:false,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:false,&quot;startSelection&quot;:0,&quot;endSelection&quot;:0,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;19!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;wakanda-extension-web-editor&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/web/app/APICall/DGFIP/apiCall.dgfip.controller.js&quot;,&quot;name&quot;:&quot;apiCall.dgfip.controller.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:551,&quot;endSelection&quot;:551,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/backend/handlers/dgfipCallback.js&quot;,&quot;name&quot;:&quot;dgfipCallback.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:2113,&quot;endSelection&quot;:2113,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;extensionView&quot;,&quot;path&quot;:&quot;../Adullact/web/app/APICall/endRequest/apiCall.endRequest.html&quot;,&quot;name&quot;:&quot;apiCall.endRequest.html&quot;,&quot;showOutline&quot;:false,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:false,&quot;startSelection&quot;:0,&quot;endSelection&quot;:0,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;19!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;wakanda-extension-web-editor&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/backend/handlers/CallBackFC.js&quot;,&quot;name&quot;:&quot;CallBackFC.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:2568,&quot;endSelection&quot;:2568,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/web/app/app.js&quot;,&quot;name&quot;:&quot;app.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:403,&quot;endSelection&quot;:415,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;view&quot;,&quot;path&quot;:&quot;C:\\Program Files\\Wakanda\\Studio\\Extensions\\FindInFiles\\index.html&quot;,&quot;name&quot;:&quot;Find in Files&quot;,&quot;showOutline&quot;:false,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:false,&quot;startSelection&quot;:0,&quot;endSelection&quot;:0,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;3!1!2017&quot;,&quot;extensionFolderName&quot;:&quot;FindInFiles&quot;,&quot;closable&quot;:true}],&quot;current&quot;:6},&quot;right&quot;:{&quot;tabs&quot;:[{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/web/app/account/signin/account.signin.controller.js&quot;,&quot;name&quot;:&quot;account.signin.controller.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:119,&quot;endSelection&quot;:131,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/web/app/APICall/CAF/apiCall.caf.controller.js&quot;,&quot;name&quot;:&quot;apiCall.caf.controller.js&quot;,&quot;showOutline&quot;:true,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:48,&quot;endSelection&quot;:48,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;20!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true},{&quot;kind&quot;:&quot;code&quot;,&quot;path&quot;:&quot;../Adullact/web/app/APICall/personalisedData/apiCall.personalisedData.controller.js&quot;,&quot;name&quot;:&quot;apiCall.personalisedData.controller.js*&quot;,&quot;showOutline&quot;:false,&quot;outlineWidth&quot;:250,&quot;showOutput&quot;:false,&quot;outputHeight&quot;:250,&quot;showStatusBar&quot;:true,&quot;showToolbar&quot;:true,&quot;sourceCodeMode&quot;:true,&quot;startSelection&quot;:414,&quot;endSelection&quot;:414,&quot;leftToRightSelection&quot;:true,&quot;lastModificationTime&quot;:&quot;19!9!2017&quot;,&quot;extensionFolderName&quot;:&quot;&quot;,&quot;closable&quot;:true}],&quot;current&quot;:2},&quot;bottom&quot;:{&quot;tabs&quot;:[],&quot;current&quot;:-1},&quot;side&quot;:{&quot;tabs&quot;:[],&quot;current&quot;:-1},&quot;mainSplitter&quot;:{&quot;leftPanelWidth&quot;:300,&quot;rightPanelWidth&quot;:800,&quot;leftPanelCollapsed&quot;:0,&quot;rightPanelCollapsed&quot;:0},&quot;hSplitter&quot;:{&quot;leftPanelWidth&quot;:804,&quot;rightPanelWidth&quot;:100,&quot;leftPanelCollapsed&quot;:0,&quot;rightPanelCollapsed&quot;:0},&quot;vSplitter&quot;:{&quot;topPanelHeight&quot;:443,&quot;bottomPanelHeight&quot;:200,&quot;topPanelCollapsed&quot;:0,&quot;bottomPanelCollapsed&quot;:1},&quot;home&quot;:&quot;side&quot;,&quot;startPage&quot;:&quot;left&quot;}}"/>
\ No newline at end of file
Adullact Solution/Logs/Adullact_log_1.txt
View file @ cfc17f6c
This source diff could not be displayed because it is too large. You can view the blob instead.
Adullact Solution/breakpoints.json deleted 100644 → 0
View file @ dea503d0
{"breakpoints":[{"name":"admin","values":[{"filename":"../Adullact/backend/handlers/dgfipCallback.js","lines":[62],"inactiveLines":[]}]}]}
\ No newline at end of file
Adullact/backend/handlers/CallBackFC.js
View file @ cfc17f6c
......@@ -9,7 +9,6 @@ function callBackFC(request, response) {
}
var code = "";
var state = "";
var redirectURL = "";
try {
if ((code = request.parts[0].asText) == null ||
......@@ -45,29 +44,27 @@ function callBackFC(request, response) {
newTicket.save();
res.msg = "callBackFc OK";
res.status = true;
}
catch (e) {
res.msg = e.message;
}
finally {
// stateMutex.unlock();
var uri = Constantes.uri;
response.statusCode = 302;
if((serviceIdx.config.avisImposition) || (serviceIdx.config.adresseFiscale)){
redirectURL = uri+"/app/#!/dgfip?id="+newTicket.ID+"&state="+serviceIdx.ID;
if((serviceIdx.config.avisImposition) || (serviceIdx.config.adresseFiscale)){
response.headers["Location"] = uri+"/app/#!/dgfip?id="+newTicket.ID+"&state="+serviceIdx.ID;
}
else if((serviceIdx.config.adresse) || (serviceIdx.config.quotientFamilial) || (serviceIdx.config.compositionFamiliale)){
redirectURL = uri+"/app/#!/caf?ticket="+newTicket.ID+"&srv="+serviceIdx.ID;
response.headers["Location"] = uri+"/app/#!/caf?ticket="+newTicket.ID+"&srv="+serviceIdx.ID;
}
else if(serviceIdx.personaliseData.length > 0){
redirectURL = uri+"/app/#!/personalisedData?srv="+serviceIdx.ID+"&ticket="+newTicket.ID;
response.headers["Location"] = uri+"/app/#!/personalisedData?srv="+serviceIdx.ID+"&ticket="+newTicket.ID;
}
else{
//response.headers["Location"] = serviceIdx.collectivity.postRedirectUri;
redirectURL = uri+"/app/#!/endRequest?srv="+serviceIdx.ID+"&ticket="+newTicket.ID;
response.headers["Location"] = uri+"/app/#!/endRequest?srv="+serviceIdx.ID+"&ticket="+newTicket.ID;
}
}
catch (e) {
res.msg = e.message;
redirectURL = uri+"/app/#!/error_service";
}
finally {
// stateMutex.unlock();
response.headers["Location"] = redirectURL;
}
}
Adullact/backend/handlers/dgfipCallback.js
View file @ cfc17f6c
......@@ -25,7 +25,7 @@ function DgfipCallBack (request, response) {
return response;
}
catch (e) {
// console.log(e.message);
console.log(e.message);
response.statusCode = 400;
response.message = "Une erreur est survenue";
}
......@@ -56,12 +56,11 @@ getInfoApiParticulier = function(Info)
xhr.onreadystatechange = function(event){
res.statusCode = xhr.status;
if (xhr.readyState == 4 && xhr.status == 200){
// console.log("ligne 220 "+xhr.responseText);
console.log("ligne 220 "+xhr.responseText);
response = JSON.parse(xhr.responseText);
}
else if (xhr.status != 200){
res.msg = xhr.responseText
console.log("voila: "+res.msg);
if(xhr.responseText){
response = JSON.parse(xhr.responseText);
}
......@@ -81,7 +80,7 @@ getInfoApiParticulier = function(Info)
}
function sendMail(currentTicket){
function sendMail(currentTicket){
var defaultMail = true;
var serviceName = currentTicket.service.name;
var mails = currentTicket.service.mailCollection;
......
Adullact/backend/logs/HTTPServer.waLog deleted 100644 → 0
View file @ dea503d0
This diff is collapsed.
Adullact/backend/modules/const.js
View file @ cfc17f6c
exports.uri = "http://127.0.0.1:8089";
//exports.uri = "http://127.0.0.1:8089";
exports.templateID = "a2334b30-0967-4126-90f2-a3b158f2973b";
exports.uri = "http://test212.us.wak-apps.com";
Adullact/web/app/APICall/CAF/apiCall.caf.controller.js
View file @ cfc17f6c
app.controller("cafCtrl", function ($scope, ds, $http, $location, $state, $stateParams) {
app.controller("cafCtrl", function ($scope, ds, mainEndPoint, $http, $location, $state, $stateParams) {
$scope.loading = false;
$scope.msg = "";
......@@ -23,7 +23,7 @@ app.controller("cafCtrl", function ($scope, ds, $http, $location, $state, $stat
data.codePostal = user.codePostal;
data.numeroAllocataire = user.numAlloc;
data.refTicket = ticketID;
var url = "/api/v1/caf/callback";
var url = mainEndPoint + "/api/v1/caf/callback";
$http.post(url, data).then(function (result) {
ds.Services.$find(serviceID).$promise.then(function (event) {
......
Adullact/web/app/APICall/DGFIP/apiCall.dgfip.controller.js
View file @ cfc17f6c
app.controller("dgfipCtrl", function($scope, ds, $location, $state, $http, $timeout) {
app.controller("dgfipCtrl", function($scope, ds, mainEndPoint, $location, $state, $http, $timeout) {
$scope.msg = "";
var ticketID = $location.$$search.id;
var serviceID = $location.$$search.state;
......@@ -13,7 +13,7 @@ app.controller("dgfipCtrl", function($scope, ds, $location, $state, $http, $tim
$scope.msg = 'veuillez remplir les champs';
}
else {
var url = "/api/v1/dgfip/callback";
var url = mainEndPoint + "/api/v1/dgfip/callback";
var data = {
'numFiscal': user.numFiscal,
'refAvis': user.refAvis,
......
Adullact/web/app/APICall/personalisedData/apiCall.personalisedData.controller.js
View file @ cfc17f6c
......@@ -12,7 +12,7 @@ app.directive('ngFiles', ['$parse', function ($parse) {
}
}])
app.controller("personaliseDataCtrl", function ($stateParams, $scope, ds, $http, $location, $state) {
app.controller("personaliseDataCtrl", function ($stateParams, $scope, ds, $http, $location, mainEndPoint, $state) {
var s_ID = $stateParams.srv || $location.$$search.srv;
var t_ID = $stateParams.ticket || $location.$$search.ticket;
......
Adullact/web/app/account/signin/account.signin.controller.js
View file @ cfc17f6c
app.controller("signinController", function($scope, ds ,$stateParams, $window, $location) {
/**
* Created by chafaiwalid on 04/07/2017.
*/
app.controller("signinController", function($scope, ds ,$stateParams, mainEndPoint,$window, $location) {
$scope.requested = $stateParams.requested;
$scope.loginFalse = false;
$scope.account_disabled = false;
......
Adullact/web/app/administration/requests/administration.requests.html
View file @ cfc17f6c
......@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-5 pull-right">
<form class="form-inline">
<div class="form-group filter pull-right">
<div class="form-group filter">
<label for="filter" class="text-filter">Filtrer par type de service:</label>
<select class="form-control choix" ng-change="getTicketFilter()" id="filter" ng-model="filterName">
<option value="tous" selected>Tous</option>
......
Adullact/web/app/administration/services/errorService/services.errorService.controller.js deleted 100644 → 0
View file @ dea503d0
app.controller("errorServiceCtrl", function ($rootScope, $scope, ds, $location) {
});
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment