|
|
|
|
@@ -4,17 +4,11 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : style bon de récéption">
|
|
|
|
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : bouton de mise en attente">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/components/workflow/workflow-weight.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/workflow/workflow-weight.vue" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/composables/steps/useWeighingStep.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/composables/steps/useWeighingStep.ts" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/composables/useWeighing.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/composables/useWeighing.ts" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/composables/useWorkflowSteps.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/composables/useWorkflowSteps.ts" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/pages/reception/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/[[id]].vue" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/frontend/services/auth.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/auth.ts" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
@@ -46,7 +40,7 @@
|
|
|
|
|
<component name="Git.Settings">
|
|
|
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
|
|
|
<map>
|
|
|
|
|
<entry key="$PROJECT_DIR$" value="feat/327-voir-modifier-une-expedition-terminee" />
|
|
|
|
|
<entry key="$PROJECT_DIR$" value="develop" />
|
|
|
|
|
</map>
|
|
|
|
|
</option>
|
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
|
@@ -230,36 +224,36 @@
|
|
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="PropertiesComponent">{
|
|
|
|
|
"keyToString": {
|
|
|
|
|
"RunOnceActivity.MCP Project settings loaded": "true",
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
|
|
|
|
"git-widget-placeholder": "develop",
|
|
|
|
|
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme",
|
|
|
|
|
"node.js.detected.package.eslint": "true",
|
|
|
|
|
"node.js.detected.package.tslint": "true",
|
|
|
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
|
"node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
|
"nodejs_package_manager_path": "npm",
|
|
|
|
|
"settings.editor.selected.configurable": "advanced.settings",
|
|
|
|
|
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
|
|
|
|
"vue.rearranger.settings.migration": "true"
|
|
|
|
|
<component name="PropertiesComponent"><![CDATA[{
|
|
|
|
|
"keyToString": {
|
|
|
|
|
"RunOnceActivity.MCP Project settings loaded": "true",
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
|
|
|
|
"git-widget-placeholder": "fix/FER-11-corriger-le-probleme-de-bearer-token",
|
|
|
|
|
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme",
|
|
|
|
|
"node.js.detected.package.eslint": "true",
|
|
|
|
|
"node.js.detected.package.tslint": "true",
|
|
|
|
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
|
|
|
"node.js.selected.package.tslint": "(autodetect)",
|
|
|
|
|
"nodejs_package_manager_path": "npm",
|
|
|
|
|
"settings.editor.selected.configurable": "advanced.settings",
|
|
|
|
|
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
|
|
|
|
"vue.rearranger.settings.migration": "true"
|
|
|
|
|
},
|
|
|
|
|
"keyToStringList": {
|
|
|
|
|
"DatabaseDriversLRU": [
|
|
|
|
|
"postgresql"
|
|
|
|
|
"keyToStringList": {
|
|
|
|
|
"DatabaseDriversLRU": [
|
|
|
|
|
"postgresql"
|
|
|
|
|
],
|
|
|
|
|
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
|
|
|
|
"TEXT"
|
|
|
|
|
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
|
|
|
|
"TEXT"
|
|
|
|
|
],
|
|
|
|
|
"vue.recent.templates": [
|
|
|
|
|
"Vue Composition API Component"
|
|
|
|
|
"vue.recent.templates": [
|
|
|
|
|
"Vue Composition API Component"
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}</component>
|
|
|
|
|
}]]></component>
|
|
|
|
|
<component name="RecentsManager">
|
|
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
|
<recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
|
|
|
|
|
@@ -331,15 +325,7 @@
|
|
|
|
|
<workItem from="1773766075191" duration="6202000" />
|
|
|
|
|
<workItem from="1773824491213" duration="24805000" />
|
|
|
|
|
<workItem from="1774275549972" duration="51000" />
|
|
|
|
|
<workItem from="1774276665015" duration="7447000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00030" summary="fix : script de déploiement">
|
|
|
|
|
<option name="closed" value="true" />
|
|
|
|
|
<created>1769098182184</created>
|
|
|
|
|
<option name="number" value="00030" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00030" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1769098182184</updated>
|
|
|
|
|
<workItem from="1774276665015" duration="13844000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00031" summary="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil">
|
|
|
|
|
<option name="closed" value="true" />
|
|
|
|
|
@@ -725,7 +711,15 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1774285464091</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="79" />
|
|
|
|
|
<task id="LOCAL-00079" summary="fix : bouton de mise en attente">
|
|
|
|
|
<option name="closed" value="true" />
|
|
|
|
|
<created>1774337609427</created>
|
|
|
|
|
<option name="number" value="00079" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00079" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1774337609427</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="80" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
|
@@ -775,7 +769,6 @@
|
|
|
|
|
</option>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
|
<MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
|
|
|
|
|
<MESSAGE value="feat : changelog" />
|
|
|
|
|
<MESSAGE value="feat : lister les expeditions terminees" />
|
|
|
|
|
<MESSAGE value="fix: corrections diverses" />
|
|
|
|
|
@@ -800,7 +793,8 @@
|
|
|
|
|
<MESSAGE value="fix : order navbar + modification création fournisseur et client" />
|
|
|
|
|
<MESSAGE value="fix : order récéption/expédition + correction style bouton récéption" />
|
|
|
|
|
<MESSAGE value="fix : style bon de récéption" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="fix : style bon de récéption" />
|
|
|
|
|
<MESSAGE value="fix : bouton de mise en attente" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="fix : bouton de mise en attente" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="XDebuggerManager">
|
|
|
|
|
<breakpoint-manager>
|
|
|
|
|
|